From 2763677aa11dfd0f81b9351ae1c6be559174e371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Tue, 18 Jan 2022 10:01:20 +0100 Subject: [PATCH 01/11] MOBILE-3811 user-menu: Add border when on main tab bar --- .../components/user-menu-button/user-menu-button.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.scss b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.scss index 8695620af..85bb76e70 100644 --- a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.scss +++ b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.scss @@ -10,3 +10,8 @@ core-user-avatar { padding: 2px !important; border: 1px solid var(--color); } + +:host-context(ion-tab-bar) core-user-avatar ::ng-deep img { + padding: 2px !important; + border: 1px solid var(--color); +} From 187400dab8279b61f3650c9599814fa2633bd05c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Tue, 18 Jan 2022 09:57:50 +0100 Subject: [PATCH 02/11] MOBILE-3811 mod: Add new module icons and remove unused ones --- scripts/langindex.json | 3 - src/assets/img/mod/assign.svg | 99 +--- src/assets/img/mod/book.svg | 91 +--- src/assets/img/mod/chat.svg | 89 +--- src/assets/img/mod/choice.svg | 60 +-- src/assets/img/mod/data.svg | 105 +--- src/assets/img/mod/external-tool.svg | 69 +-- src/assets/img/mod/feedback.svg | 149 +----- src/assets/img/mod/folder.svg | 73 +-- src/assets/img/mod/forum.svg | 88 +-- src/assets/img/mod/glossary.svg | 155 +----- src/assets/img/mod/h5pactivity.svg | 17 +- src/assets/img/mod/imscp.svg | 174 +----- src/assets/img/mod/label.svg | 108 +--- src/assets/img/mod/lesson.svg | 141 +---- src/assets/img/mod/lti.svg | 69 +-- src/assets/img/mod/page.svg | 125 +---- src/assets/img/mod/quiz.svg | 101 +--- src/assets/img/mod/resource.svg | 70 +-- src/assets/img/mod/scorm.svg | 92 +--- src/assets/img/mod/survey.svg | 102 +--- src/assets/img/mod/url.svg | 502 +----------------- src/assets/img/mod/wiki.svg | 253 +-------- src/assets/img/mod/workshop.svg | 117 +--- .../assignment.svg => mod_legacy/assign.svg} | 0 src/assets/img/mod_legacy/bigbluebuttonbn.svg | 55 ++ src/assets/img/mod_legacy/book.svg | 80 +++ src/assets/img/mod_legacy/chat.svg | 77 +++ src/assets/img/mod_legacy/choice.svg | 46 ++ .../{mod/database.svg => mod_legacy/data.svg} | 0 src/assets/img/mod_legacy/external-tool.svg | 55 ++ src/assets/img/mod_legacy/feedback.svg | 133 +++++ src/assets/img/mod_legacy/folder.svg | 65 +++ src/assets/img/mod_legacy/forum.svg | 71 +++ src/assets/img/mod_legacy/glossary.svg | 146 +++++ src/assets/img/mod_legacy/h5pactivity.svg | 1 + .../img/{mod/ims.svg => mod_legacy/imscp.svg} | 0 src/assets/img/mod_legacy/label.svg | 94 ++++ src/assets/img/mod_legacy/lesson.svg | 126 +++++ src/assets/img/mod_legacy/lti.svg | 55 ++ src/assets/img/mod_legacy/page.svg | 112 ++++ src/assets/img/mod_legacy/quiz.svg | 90 ++++ .../{mod/file.svg => mod_legacy/resource.svg} | 0 src/assets/img/mod_legacy/scorm.svg | 84 +++ src/assets/img/mod_legacy/survey.svg | 89 ++++ src/assets/img/mod_legacy/url.svg | 485 +++++++++++++++++ src/assets/img/mod_legacy/wiki.svg | 228 ++++++++ src/assets/img/mod_legacy/workshop.svg | 98 ++++ 48 files changed, 2512 insertions(+), 2530 deletions(-) rename src/assets/img/{mod/assignment.svg => mod_legacy/assign.svg} (100%) create mode 100644 src/assets/img/mod_legacy/bigbluebuttonbn.svg create mode 100644 src/assets/img/mod_legacy/book.svg create mode 100644 src/assets/img/mod_legacy/chat.svg create mode 100644 src/assets/img/mod_legacy/choice.svg rename src/assets/img/{mod/database.svg => mod_legacy/data.svg} (100%) create mode 100644 src/assets/img/mod_legacy/external-tool.svg create mode 100644 src/assets/img/mod_legacy/feedback.svg create mode 100644 src/assets/img/mod_legacy/folder.svg create mode 100644 src/assets/img/mod_legacy/forum.svg create mode 100644 src/assets/img/mod_legacy/glossary.svg create mode 100644 src/assets/img/mod_legacy/h5pactivity.svg rename src/assets/img/{mod/ims.svg => mod_legacy/imscp.svg} (100%) create mode 100644 src/assets/img/mod_legacy/label.svg create mode 100644 src/assets/img/mod_legacy/lesson.svg create mode 100644 src/assets/img/mod_legacy/lti.svg create mode 100644 src/assets/img/mod_legacy/page.svg create mode 100644 src/assets/img/mod_legacy/quiz.svg rename src/assets/img/{mod/file.svg => mod_legacy/resource.svg} (100%) create mode 100644 src/assets/img/mod_legacy/scorm.svg create mode 100644 src/assets/img/mod_legacy/survey.svg create mode 100644 src/assets/img/mod_legacy/url.svg create mode 100644 src/assets/img/mod_legacy/wiki.svg create mode 100644 src/assets/img/mod_legacy/workshop.svg diff --git a/scripts/langindex.json b/scripts/langindex.json index 2d2e2f376..4553ed0ac 100644 --- a/scripts/langindex.json +++ b/scripts/langindex.json @@ -1979,12 +1979,10 @@ "core.minutes": "moodle", "core.misc": "admin", "core.mod_assign": "assign/pluginname", - "core.mod_assignment": "assignment/pluginname", "core.mod_book": "book/pluginname", "core.mod_chat": "chat/pluginname", "core.mod_choice": "choice/pluginname", "core.mod_data": "data/pluginname", - "core.mod_database": "data/pluginname", "core.mod_external-tool": "lti/pluginname", "core.mod_feedback": "feedback/pluginname", "core.mod_file": "moodle/file", @@ -1992,7 +1990,6 @@ "core.mod_forum": "forum/pluginname", "core.mod_glossary": "glossary/pluginname", "core.mod_h5pactivity": "h5pactivity/pluginname", - "core.mod_ims": "imscp/pluginname", "core.mod_imscp": "imscp/pluginname", "core.mod_label": "label/pluginname", "core.mod_lesson": "lesson/pluginname", diff --git a/src/assets/img/mod/assign.svg b/src/assets/img/mod/assign.svg index 41a788985..18fea36dd 100644 --- a/src/assets/img/mod/assign.svg +++ b/src/assets/img/mod/assign.svg @@ -1,89 +1,10 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/src/assets/img/mod/book.svg b/src/assets/img/mod/book.svg index 740a35160..994edc734 100644 --- a/src/assets/img/mod/book.svg +++ b/src/assets/img/mod/book.svg @@ -1,80 +1,11 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/src/assets/img/mod/chat.svg b/src/assets/img/mod/chat.svg index 9dd304b78..52efce452 100644 --- a/src/assets/img/mod/chat.svg +++ b/src/assets/img/mod/chat.svg @@ -1,77 +1,12 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/src/assets/img/mod/choice.svg b/src/assets/img/mod/choice.svg index 4d455910c..02905029c 100644 --- a/src/assets/img/mod/choice.svg +++ b/src/assets/img/mod/choice.svg @@ -1,46 +1,14 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/src/assets/img/mod/data.svg b/src/assets/img/mod/data.svg index 954777f09..3bf47aa86 100644 --- a/src/assets/img/mod/data.svg +++ b/src/assets/img/mod/data.svg @@ -1,87 +1,18 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/src/assets/img/mod/external-tool.svg b/src/assets/img/mod/external-tool.svg index ebbbe3084..cc70c5de9 100644 --- a/src/assets/img/mod/external-tool.svg +++ b/src/assets/img/mod/external-tool.svg @@ -1,55 +1,14 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/src/assets/img/mod/feedback.svg b/src/assets/img/mod/feedback.svg index 58d0f080b..e4f8916f6 100644 --- a/src/assets/img/mod/feedback.svg +++ b/src/assets/img/mod/feedback.svg @@ -1,133 +1,16 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/src/assets/img/mod/folder.svg b/src/assets/img/mod/folder.svg index 6c2a9fe19..e8dd12e1a 100644 --- a/src/assets/img/mod/folder.svg +++ b/src/assets/img/mod/folder.svg @@ -1,65 +1,8 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/src/assets/img/mod/forum.svg b/src/assets/img/mod/forum.svg index aab9a8f44..defe1015d 100644 --- a/src/assets/img/mod/forum.svg +++ b/src/assets/img/mod/forum.svg @@ -1,71 +1,17 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/src/assets/img/mod/glossary.svg b/src/assets/img/mod/glossary.svg index f330727e3..465bc2dcd 100644 --- a/src/assets/img/mod/glossary.svg +++ b/src/assets/img/mod/glossary.svg @@ -1,146 +1,9 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/src/assets/img/mod/h5pactivity.svg b/src/assets/img/mod/h5pactivity.svg index 97fef5728..d76a924d5 100644 --- a/src/assets/img/mod/h5pactivity.svg +++ b/src/assets/img/mod/h5pactivity.svg @@ -1 +1,16 @@ -h5p finalArtboard 1 \ No newline at end of file + + + + + + + + diff --git a/src/assets/img/mod/imscp.svg b/src/assets/img/mod/imscp.svg index 5589cd0c5..30705d0a2 100644 --- a/src/assets/img/mod/imscp.svg +++ b/src/assets/img/mod/imscp.svg @@ -1,156 +1,18 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/assets/img/mod/label.svg b/src/assets/img/mod/label.svg index ac232fc58..b2494df89 100644 --- a/src/assets/img/mod/label.svg +++ b/src/assets/img/mod/label.svg @@ -1,94 +1,14 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + diff --git a/src/assets/img/mod/lesson.svg b/src/assets/img/mod/lesson.svg index 0a0e5dfd5..80ddee00b 100644 --- a/src/assets/img/mod/lesson.svg +++ b/src/assets/img/mod/lesson.svg @@ -1,126 +1,15 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/src/assets/img/mod/lti.svg b/src/assets/img/mod/lti.svg index ebbbe3084..cc70c5de9 100644 --- a/src/assets/img/mod/lti.svg +++ b/src/assets/img/mod/lti.svg @@ -1,55 +1,14 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/src/assets/img/mod/page.svg b/src/assets/img/mod/page.svg index eb7cae6c8..83751046f 100644 --- a/src/assets/img/mod/page.svg +++ b/src/assets/img/mod/page.svg @@ -1,112 +1,13 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/src/assets/img/mod/quiz.svg b/src/assets/img/mod/quiz.svg index 90473416f..26cb7dda7 100644 --- a/src/assets/img/mod/quiz.svg +++ b/src/assets/img/mod/quiz.svg @@ -1,90 +1,11 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/src/assets/img/mod/resource.svg b/src/assets/img/mod/resource.svg index 2039a2ea2..fde303973 100644 --- a/src/assets/img/mod/resource.svg +++ b/src/assets/img/mod/resource.svg @@ -1,60 +1,10 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + diff --git a/src/assets/img/mod/scorm.svg b/src/assets/img/mod/scorm.svg index 77891eca4..76ec9c64f 100644 --- a/src/assets/img/mod/scorm.svg +++ b/src/assets/img/mod/scorm.svg @@ -1,84 +1,8 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/src/assets/img/mod/survey.svg b/src/assets/img/mod/survey.svg index a97fe77ef..61e63e52b 100644 --- a/src/assets/img/mod/survey.svg +++ b/src/assets/img/mod/survey.svg @@ -1,89 +1,13 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + diff --git a/src/assets/img/mod/url.svg b/src/assets/img/mod/url.svg index 56bdb5541..eb00b261c 100644 --- a/src/assets/img/mod/url.svg +++ b/src/assets/img/mod/url.svg @@ -1,485 +1,17 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/src/assets/img/mod/wiki.svg b/src/assets/img/mod/wiki.svg index f3101ce19..ff8eddd32 100644 --- a/src/assets/img/mod/wiki.svg +++ b/src/assets/img/mod/wiki.svg @@ -1,228 +1,25 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/src/assets/img/mod/workshop.svg b/src/assets/img/mod/workshop.svg index f466455a6..594cfa205 100644 --- a/src/assets/img/mod/workshop.svg +++ b/src/assets/img/mod/workshop.svg @@ -1,98 +1,19 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/src/assets/img/mod/assignment.svg b/src/assets/img/mod_legacy/assign.svg similarity index 100% rename from src/assets/img/mod/assignment.svg rename to src/assets/img/mod_legacy/assign.svg diff --git a/src/assets/img/mod_legacy/bigbluebuttonbn.svg b/src/assets/img/mod_legacy/bigbluebuttonbn.svg new file mode 100644 index 000000000..7b92ab21b --- /dev/null +++ b/src/assets/img/mod_legacy/bigbluebuttonbn.svg @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/mod_legacy/book.svg b/src/assets/img/mod_legacy/book.svg new file mode 100644 index 000000000..740a35160 --- /dev/null +++ b/src/assets/img/mod_legacy/book.svg @@ -0,0 +1,80 @@ + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/mod_legacy/chat.svg b/src/assets/img/mod_legacy/chat.svg new file mode 100644 index 000000000..9dd304b78 --- /dev/null +++ b/src/assets/img/mod_legacy/chat.svg @@ -0,0 +1,77 @@ + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/mod_legacy/choice.svg b/src/assets/img/mod_legacy/choice.svg new file mode 100644 index 000000000..4d455910c --- /dev/null +++ b/src/assets/img/mod_legacy/choice.svg @@ -0,0 +1,46 @@ + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/mod/database.svg b/src/assets/img/mod_legacy/data.svg similarity index 100% rename from src/assets/img/mod/database.svg rename to src/assets/img/mod_legacy/data.svg diff --git a/src/assets/img/mod_legacy/external-tool.svg b/src/assets/img/mod_legacy/external-tool.svg new file mode 100644 index 000000000..ebbbe3084 --- /dev/null +++ b/src/assets/img/mod_legacy/external-tool.svg @@ -0,0 +1,55 @@ + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/mod_legacy/feedback.svg b/src/assets/img/mod_legacy/feedback.svg new file mode 100644 index 000000000..58d0f080b --- /dev/null +++ b/src/assets/img/mod_legacy/feedback.svg @@ -0,0 +1,133 @@ + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/mod_legacy/folder.svg b/src/assets/img/mod_legacy/folder.svg new file mode 100644 index 000000000..6c2a9fe19 --- /dev/null +++ b/src/assets/img/mod_legacy/folder.svg @@ -0,0 +1,65 @@ + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/mod_legacy/forum.svg b/src/assets/img/mod_legacy/forum.svg new file mode 100644 index 000000000..aab9a8f44 --- /dev/null +++ b/src/assets/img/mod_legacy/forum.svg @@ -0,0 +1,71 @@ + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/mod_legacy/glossary.svg b/src/assets/img/mod_legacy/glossary.svg new file mode 100644 index 000000000..f330727e3 --- /dev/null +++ b/src/assets/img/mod_legacy/glossary.svg @@ -0,0 +1,146 @@ + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/mod_legacy/h5pactivity.svg b/src/assets/img/mod_legacy/h5pactivity.svg new file mode 100644 index 000000000..97fef5728 --- /dev/null +++ b/src/assets/img/mod_legacy/h5pactivity.svg @@ -0,0 +1 @@ +h5p finalArtboard 1 \ No newline at end of file diff --git a/src/assets/img/mod/ims.svg b/src/assets/img/mod_legacy/imscp.svg similarity index 100% rename from src/assets/img/mod/ims.svg rename to src/assets/img/mod_legacy/imscp.svg diff --git a/src/assets/img/mod_legacy/label.svg b/src/assets/img/mod_legacy/label.svg new file mode 100644 index 000000000..ac232fc58 --- /dev/null +++ b/src/assets/img/mod_legacy/label.svg @@ -0,0 +1,94 @@ + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/mod_legacy/lesson.svg b/src/assets/img/mod_legacy/lesson.svg new file mode 100644 index 000000000..0a0e5dfd5 --- /dev/null +++ b/src/assets/img/mod_legacy/lesson.svg @@ -0,0 +1,126 @@ + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/mod_legacy/lti.svg b/src/assets/img/mod_legacy/lti.svg new file mode 100644 index 000000000..ebbbe3084 --- /dev/null +++ b/src/assets/img/mod_legacy/lti.svg @@ -0,0 +1,55 @@ + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/mod_legacy/page.svg b/src/assets/img/mod_legacy/page.svg new file mode 100644 index 000000000..eb7cae6c8 --- /dev/null +++ b/src/assets/img/mod_legacy/page.svg @@ -0,0 +1,112 @@ + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/mod_legacy/quiz.svg b/src/assets/img/mod_legacy/quiz.svg new file mode 100644 index 000000000..90473416f --- /dev/null +++ b/src/assets/img/mod_legacy/quiz.svg @@ -0,0 +1,90 @@ + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/mod/file.svg b/src/assets/img/mod_legacy/resource.svg similarity index 100% rename from src/assets/img/mod/file.svg rename to src/assets/img/mod_legacy/resource.svg diff --git a/src/assets/img/mod_legacy/scorm.svg b/src/assets/img/mod_legacy/scorm.svg new file mode 100644 index 000000000..77891eca4 --- /dev/null +++ b/src/assets/img/mod_legacy/scorm.svg @@ -0,0 +1,84 @@ + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/mod_legacy/survey.svg b/src/assets/img/mod_legacy/survey.svg new file mode 100644 index 000000000..a97fe77ef --- /dev/null +++ b/src/assets/img/mod_legacy/survey.svg @@ -0,0 +1,89 @@ + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/mod_legacy/url.svg b/src/assets/img/mod_legacy/url.svg new file mode 100644 index 000000000..56bdb5541 --- /dev/null +++ b/src/assets/img/mod_legacy/url.svg @@ -0,0 +1,485 @@ + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/mod_legacy/wiki.svg b/src/assets/img/mod_legacy/wiki.svg new file mode 100644 index 000000000..f3101ce19 --- /dev/null +++ b/src/assets/img/mod_legacy/wiki.svg @@ -0,0 +1,228 @@ + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/mod_legacy/workshop.svg b/src/assets/img/mod_legacy/workshop.svg new file mode 100644 index 000000000..f466455a6 --- /dev/null +++ b/src/assets/img/mod_legacy/workshop.svg @@ -0,0 +1,98 @@ + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 851d33d3803536fbd4307d6d6eeaa8272f557b19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Tue, 18 Jan 2022 09:58:37 +0100 Subject: [PATCH 03/11] MOBILE-3811 mod: Use new module icons on 4.0+ sites --- src/core/components/mod-icon/mod-icon.scss | 19 +++++++++-- src/core/components/mod-icon/mod-icon.ts | 33 +++++++++++++++++-- .../components/module/core-course-module.html | 2 +- .../course/components/module/module.scss | 8 ++--- src/core/features/course/services/course.ts | 13 +++++--- src/core/lang.json | 3 -- src/theme/globals.variables.scss | 10 ++++-- src/theme/theme.light.scss | 5 +++ 8 files changed, 73 insertions(+), 20 deletions(-) diff --git a/src/core/components/mod-icon/mod-icon.scss b/src/core/components/mod-icon/mod-icon.scss index e8cbb5754..a5b781a26 100644 --- a/src/core/components/mod-icon/mod-icon.scss +++ b/src/core/components/mod-icon/mod-icon.scss @@ -1,3 +1,5 @@ +@import "~theme/globals"; + :host { --size: var(--module-icon-size); --margin-end: 0px; @@ -6,6 +8,19 @@ margin-top: var(--margin-vertical); margin-bottom: var(--margin-vertical); margin-right: var(--margin-end); + border-radius: 4px; + padding: 0.7rem; + background-color: $gray-lighter; + + @each $type, $value in $activity-icon-colors { + &.#{$type} { + background-color: var(--activity#{$type}); + img { + filter: brightness(0) invert(1); + } + } + } + } img { @@ -23,7 +38,7 @@ img { :host-context(ion-item) { --margin-vertical: 12px; - --margin-end: 32px; + --margin-end: 1rem; } :host-context(ion-card ion-item) { @@ -34,4 +49,4 @@ img { :host-context([dir=rtl]) { margin-right: unset; margin-left: var(--margin-end); -} \ No newline at end of file +} diff --git a/src/core/components/mod-icon/mod-icon.ts b/src/core/components/mod-icon/mod-icon.ts index c9c6b70ac..7f0262038 100644 --- a/src/core/components/mod-icon/mod-icon.ts +++ b/src/core/components/mod-icon/mod-icon.ts @@ -12,8 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { Component, Input, OnChanges, OnInit, SimpleChange } from '@angular/core'; +import { CoreConstants } from '@/core/constants'; +import { Component, ElementRef, Input, OnChanges, OnInit, SimpleChange } from '@angular/core'; import { CoreCourse } from '@features/course/services/course'; +import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate'; +import { CoreSites } from '@services/sites'; const assetsPath = 'assets/img/'; const fallbackModName = 'external-tool'; @@ -38,11 +41,31 @@ export class CoreModIconComponent implements OnInit, OnChanges { isLocalUrl = true; linkIconWithComponent = false; + protected legacyIcon = true; // @deprecatedonmoodle since Moodle 3.11. + + constructor(protected el: ElementRef) { } + /** * @inheritdoc */ async ngOnInit(): Promise { + if (!this.modname && this.modicon) { + // Guess module from the icon url. + const matches = this.modicon.match('/theme/image.php/[^/]+/([^/]+)/[-0-9]*/'); + this.modname = (matches && matches[1]) || ''; + } + this.modNameTranslated = this.modname ? CoreCourse.translateModuleName(this.modname) || '' : ''; + if (CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('4.0')) { + this.legacyIcon = false; + const purposeClass = + CoreCourseModuleDelegate.supportsFeature(this.modname, CoreConstants.FEATURE_MOD_PURPOSE, ''); + + if (purposeClass != '') { + const element: HTMLElement = this.el.nativeElement; + element.classList.add(purposeClass); + } + } this.setIcon(); } @@ -82,7 +105,13 @@ export class CoreModIconComponent implements OnInit, OnChanges { ? fallbackModName : this.modname; - this.icon = assetsPath + moduleName + '.svg'; + let path = assetsPath + 'mod/'; + if (this.legacyIcon) { + // @deprecatedonmoodle since Moodle 3.11. + path = assetsPath + 'mod_legacy/'; + } + + this.icon = path + moduleName + '.svg'; } } diff --git a/src/core/features/course/components/module/core-course-module.html b/src/core/features/course/components/module/core-course-module.html index fc9db736c..8a50cf3b3 100644 --- a/src/core/features/course/components/module/core-course-module.html +++ b/src/core/features/course/components/module/core-course-module.html @@ -58,7 +58,7 @@ diff --git a/src/core/features/course/components/module/module.scss b/src/core/features/course/components/module/module.scss index aaeaa86a3..2253562e5 100644 --- a/src/core/features/course/components/module/module.scss +++ b/src/core/features/course/components/module/module.scss @@ -31,7 +31,7 @@ } } - .core-module-module-info { + .core-course-module-info { ion-badge { text-align: start; } @@ -51,7 +51,7 @@ clear: both; } - .core-module-main-item + .core-module-module-info ion-label { + .core-module-main-item + .core-course-module-info ion-label { margin-top: 0px; } @@ -59,8 +59,4 @@ --inner-border-width: 0px; } - .core-module-module-info ion-label { - margin-inline-start: 50px; - } - } diff --git a/src/core/features/course/services/course.ts b/src/core/features/course/services/course.ts index cd482f5ca..24984dfc3 100644 --- a/src/core/features/course/services/course.ts +++ b/src/core/features/course/services/course.ts @@ -125,9 +125,8 @@ export class CoreCourseProvider { static readonly COMPONENT = 'CoreCourse'; readonly CORE_MODULES = [ - 'assign', 'assignment', 'book', 'chat', 'choice', 'data', 'database', 'date', 'external-tool', - 'feedback', 'file', 'folder', 'forum', 'glossary', 'ims', 'imscp', 'label', 'lesson', 'lti', 'page', 'quiz', - 'resource', 'scorm', 'survey', 'url', 'wiki', 'workshop', 'h5pactivity', 'bigbluebuttonbn', + 'assign', 'bigbluebuttonbn', 'book', 'chat', 'choice', 'data', 'feedback', 'folder', 'forum', 'glossary', 'h5pactivity', + 'imscp', 'label', 'lesson', 'lti', 'page', 'quiz', 'resource', 'scorm', 'survey', 'url', 'wiki', 'workshop', ]; protected logger: CoreLogger; @@ -726,8 +725,14 @@ export class CoreCourseProvider { moduleName = 'external-tool'; } + let path = 'assets/img/mod/'; + if (!CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('4.0')) { + // @deprecatedonmoodle since Moodle 3.11. + path = 'assets/img/mod_legacy/'; + } + // Use default icon on core modules. - return 'assets/img/mod/' + moduleName + '.svg'; + return path + moduleName + '.svg'; } /** diff --git a/src/core/lang.json b/src/core/lang.json index 64fcba1f9..584f0d5a6 100644 --- a/src/core/lang.json +++ b/src/core/lang.json @@ -164,12 +164,10 @@ "minutes": "minutes", "misc": "Miscellaneous", "mod_assign": "Assignment", - "mod_assignment": "Assignment 2.2 (Disabled)", "mod_book": "Book", "mod_chat": "Chat", "mod_choice": "Choice", "mod_data": "Database", - "mod_database": "Database", "mod_external-tool": "External tool", "mod_feedback": "Feedback", "mod_file": "File", @@ -177,7 +175,6 @@ "mod_forum": "Forum", "mod_glossary": "Glossary", "mod_h5pactivity": "H5P", - "mod_ims": "IMS content package", "mod_imscp": "IMS content package", "mod_label": "Label", "mod_lesson": "Lesson", diff --git a/src/theme/globals.variables.scss b/src/theme/globals.variables.scss index 3a1dbff38..4e1d7e57a 100644 --- a/src/theme/globals.variables.scss +++ b/src/theme/globals.variables.scss @@ -139,5 +139,11 @@ $core-user-hide-siteinfo: $core-more-hide-siteinfo !default; $core-user-hide-sitename: $core-more-hide-sitename !default; $core-user-hide-siteurl: $core-more-hide-siteurl !default; - - +$activity-icon-colors: ( + administration: #5d63f6, + assessment: #eb66a2, + collaboration: #f7634d, + communication: #11a676, + content: #399be2, + interface: #a378ff +) !default; diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss index a4b0b935e..f4d379c0e 100644 --- a/src/theme/theme.light.scss +++ b/src/theme/theme.light.scss @@ -316,4 +316,9 @@ --core-dd-question-color-#{$i + 1}: #{nth($core-dd-question-colors, $i + 1)}; --core-dd-question-color-#{$i + 1}-contrast: #{get_contrast_color(nth($core-dd-question-colors, $i + 1))}; } + + // Make activtity colours available for custom modules. + @each $type, $value in $activity-icon-colors { + --activity#{$type}: #{$value}; + } } From 8c82446027e422cc5533d8af5768f0b00dbb7ce9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Tue, 18 Jan 2022 09:58:44 +0100 Subject: [PATCH 04/11] MOBILE-3811 mod: Add purpose of all modules --- src/addons/mod/assign/services/handlers/module.ts | 3 ++- src/addons/mod/book/services/handlers/module.ts | 3 ++- src/addons/mod/chat/services/handlers/module.ts | 3 ++- src/addons/mod/choice/services/handlers/module.ts | 3 ++- src/addons/mod/data/services/handlers/module.ts | 3 ++- src/addons/mod/feedback/services/handlers/module.ts | 3 ++- src/addons/mod/folder/services/handlers/module.ts | 3 ++- src/addons/mod/forum/services/handlers/module.ts | 3 ++- src/addons/mod/glossary/services/handlers/module.ts | 3 ++- .../mod/h5pactivity/services/handlers/module.ts | 3 ++- src/addons/mod/imscp/services/handlers/module.ts | 3 ++- src/addons/mod/label/services/handlers/module.ts | 3 ++- src/addons/mod/lesson/services/handlers/module.ts | 3 ++- src/addons/mod/lti/services/handlers/module.ts | 3 ++- src/addons/mod/page/services/handlers/module.ts | 3 ++- src/addons/mod/quiz/services/handlers/module.ts | 3 ++- src/addons/mod/resource/services/handlers/module.ts | 3 ++- src/addons/mod/scorm/services/handlers/module.ts | 3 ++- src/addons/mod/survey/services/handlers/module.ts | 3 ++- src/addons/mod/url/services/handlers/module.ts | 3 ++- src/addons/mod/wiki/services/handlers/module.ts | 3 ++- src/addons/mod/workshop/services/handlers/module.ts | 3 ++- src/core/constants.ts | 11 +++++++++++ 23 files changed, 55 insertions(+), 22 deletions(-) diff --git a/src/addons/mod/assign/services/handlers/module.ts b/src/addons/mod/assign/services/handlers/module.ts index 7b1395e0f..bb8f569fd 100644 --- a/src/addons/mod/assign/services/handlers/module.ts +++ b/src/addons/mod/assign/services/handlers/module.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { CoreConstants } from '@/core/constants'; +import { CoreConstants, ModPurpose } from '@/core/constants'; import { Injectable, Type } from '@angular/core'; import { CoreCourseModuleHandler } from '@features/course/services/module-delegate'; import { AddonModAssignIndexComponent } from '../../components/index'; @@ -44,6 +44,7 @@ export class AddonModAssignModuleHandlerService extends CoreModuleHandlerBase im [CoreConstants.FEATURE_ADVANCED_GRADING]: true, [CoreConstants.FEATURE_PLAGIARISM]: true, [CoreConstants.FEATURE_COMMENT]: true, + [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_ASSESSMENT, }; /** diff --git a/src/addons/mod/book/services/handlers/module.ts b/src/addons/mod/book/services/handlers/module.ts index ca5fcdd4d..322737a81 100644 --- a/src/addons/mod/book/services/handlers/module.ts +++ b/src/addons/mod/book/services/handlers/module.ts @@ -15,7 +15,7 @@ import { Injectable, Type } from '@angular/core'; import { AddonModBookIndexComponent } from '../../components/index'; import { AddonModBook } from '../book'; -import { CoreConstants } from '@/core/constants'; +import { CoreConstants, ModPurpose } from '@/core/constants'; import { CoreCourseModuleHandler } from '@features/course/services/module-delegate'; import { makeSingleton } from '@singletons'; import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler'; @@ -42,6 +42,7 @@ export class AddonModBookModuleHandlerService extends CoreModuleHandlerBase impl [CoreConstants.FEATURE_GRADE_OUTCOMES]: false, [CoreConstants.FEATURE_BACKUP_MOODLE2]: true, [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true, + [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_CONTENT, }; /** diff --git a/src/addons/mod/chat/services/handlers/module.ts b/src/addons/mod/chat/services/handlers/module.ts index 16cfa87aa..c8f32227e 100644 --- a/src/addons/mod/chat/services/handlers/module.ts +++ b/src/addons/mod/chat/services/handlers/module.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { CoreConstants } from '@/core/constants'; +import { CoreConstants, ModPurpose } from '@/core/constants'; import { Injectable, Type } from '@angular/core'; import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler'; import { CoreCourseModuleHandler } from '@features/course/services/module-delegate'; @@ -40,6 +40,7 @@ export class AddonModChatModuleHandlerService extends CoreModuleHandlerBase impl [CoreConstants.FEATURE_GRADE_OUTCOMES]: true, [CoreConstants.FEATURE_BACKUP_MOODLE2]: true, [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true, + [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_COMMUNICATION, }; /** diff --git a/src/addons/mod/choice/services/handlers/module.ts b/src/addons/mod/choice/services/handlers/module.ts index 532204f81..70e3a3834 100644 --- a/src/addons/mod/choice/services/handlers/module.ts +++ b/src/addons/mod/choice/services/handlers/module.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { CoreConstants } from '@/core/constants'; +import { CoreConstants, ModPurpose } from '@/core/constants'; import { Injectable, Type } from '@angular/core'; import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler'; import { CoreCourseModuleHandler } from '@features/course/services/module-delegate'; @@ -41,6 +41,7 @@ export class AddonModChoiceModuleHandlerService extends CoreModuleHandlerBase im [CoreConstants.FEATURE_GRADE_OUTCOMES]: false, [CoreConstants.FEATURE_BACKUP_MOODLE2]: true, [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true, + [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_COMMUNICATION, }; /** diff --git a/src/addons/mod/data/services/handlers/module.ts b/src/addons/mod/data/services/handlers/module.ts index dc930ee0f..c170d8779 100644 --- a/src/addons/mod/data/services/handlers/module.ts +++ b/src/addons/mod/data/services/handlers/module.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { CoreConstants } from '@/core/constants'; +import { CoreConstants, ModPurpose } from '@/core/constants'; import { Injectable, Type } from '@angular/core'; import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler'; import { CoreCourseModuleHandler } from '@features/course/services/module-delegate'; @@ -43,6 +43,7 @@ export class AddonModDataModuleHandlerService extends CoreModuleHandlerBase impl [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true, [CoreConstants.FEATURE_RATE]: true, [CoreConstants.FEATURE_COMMENT]: true, + [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_COLLABORATION, }; /** diff --git a/src/addons/mod/feedback/services/handlers/module.ts b/src/addons/mod/feedback/services/handlers/module.ts index da1fedf27..68e0164fe 100644 --- a/src/addons/mod/feedback/services/handlers/module.ts +++ b/src/addons/mod/feedback/services/handlers/module.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { CoreConstants } from '@/core/constants'; +import { CoreConstants, ModPurpose } from '@/core/constants'; import { Injectable, Type } from '@angular/core'; import { CoreCourseModuleHandler } from '@features/course/services/module-delegate'; import { makeSingleton } from '@singletons'; @@ -41,6 +41,7 @@ export class AddonModFeedbackModuleHandlerService extends CoreModuleHandlerBase [CoreConstants.FEATURE_GRADE_OUTCOMES]: false, [CoreConstants.FEATURE_BACKUP_MOODLE2]: true, [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true, + [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_COMMUNICATION, }; /** diff --git a/src/addons/mod/folder/services/handlers/module.ts b/src/addons/mod/folder/services/handlers/module.ts index b127b468c..63dbc0df4 100644 --- a/src/addons/mod/folder/services/handlers/module.ts +++ b/src/addons/mod/folder/services/handlers/module.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { CoreConstants } from '@/core/constants'; +import { CoreConstants, ModPurpose } from '@/core/constants'; import { Injectable, Type } from '@angular/core'; import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler'; import { CoreCourseModuleHandler } from '@features/course/services/module-delegate'; @@ -41,6 +41,7 @@ export class AddonModFolderModuleHandlerService extends CoreModuleHandlerBase im [CoreConstants.FEATURE_GRADE_OUTCOMES]: false, [CoreConstants.FEATURE_BACKUP_MOODLE2]: true, [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true, + [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_CONTENT, }; /** diff --git a/src/addons/mod/forum/services/handlers/module.ts b/src/addons/mod/forum/services/handlers/module.ts index f4ad76e60..a750b83b6 100644 --- a/src/addons/mod/forum/services/handlers/module.ts +++ b/src/addons/mod/forum/services/handlers/module.ts @@ -19,7 +19,7 @@ import { CoreEvents } from '@singletons/events'; import { CoreSites } from '@services/sites'; import { CoreUtils } from '@services/utils/utils'; import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate'; -import { CoreConstants } from '@/core/constants'; +import { CoreConstants, ModPurpose } from '@/core/constants'; import { AddonModForumIndexComponent } from '../../components/index'; import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler'; import { CoreCourseModuleData } from '@features/course/services/course-helper'; @@ -48,6 +48,7 @@ export class AddonModForumModuleHandlerService extends CoreModuleHandlerBase imp [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true, [CoreConstants.FEATURE_RATE]: true, [CoreConstants.FEATURE_PLAGIARISM]: true, + [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_COLLABORATION, }; /** diff --git a/src/addons/mod/glossary/services/handlers/module.ts b/src/addons/mod/glossary/services/handlers/module.ts index b7eb1a0f6..a5240ab82 100644 --- a/src/addons/mod/glossary/services/handlers/module.ts +++ b/src/addons/mod/glossary/services/handlers/module.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { CoreConstants } from '@/core/constants'; +import { CoreConstants, ModPurpose } from '@/core/constants'; import { Injectable, Type } from '@angular/core'; import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler'; import { CoreCourseModuleHandler } from '@features/course/services/module-delegate'; @@ -43,6 +43,7 @@ export class AddonModGlossaryModuleHandlerService extends CoreModuleHandlerBase [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true, [CoreConstants.FEATURE_RATE]: true, [CoreConstants.FEATURE_PLAGIARISM]: true, + [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_COLLABORATION, }; /** diff --git a/src/addons/mod/h5pactivity/services/handlers/module.ts b/src/addons/mod/h5pactivity/services/handlers/module.ts index dfa1c7900..c6473702b 100644 --- a/src/addons/mod/h5pactivity/services/handlers/module.ts +++ b/src/addons/mod/h5pactivity/services/handlers/module.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { CoreConstants } from '@/core/constants'; +import { CoreConstants, ModPurpose } from '@/core/constants'; import { Injectable, Type } from '@angular/core'; import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler'; import { CoreCourseModuleHandler } from '@features/course/services/module-delegate'; @@ -42,6 +42,7 @@ export class AddonModH5PActivityModuleHandlerService extends CoreModuleHandlerBa [CoreConstants.FEATURE_GRADE_HAS_GRADE]: true, [CoreConstants.FEATURE_GRADE_OUTCOMES]: true, [CoreConstants.FEATURE_BACKUP_MOODLE2]: true, + [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_CONTENT, }; /** diff --git a/src/addons/mod/imscp/services/handlers/module.ts b/src/addons/mod/imscp/services/handlers/module.ts index d1dea4491..369c111cc 100644 --- a/src/addons/mod/imscp/services/handlers/module.ts +++ b/src/addons/mod/imscp/services/handlers/module.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { CoreConstants } from '@/core/constants'; +import { CoreConstants, ModPurpose } from '@/core/constants'; import { Injectable, Type } from '@angular/core'; import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler'; import { CoreCourseModuleHandler } from '@features/course/services/module-delegate'; @@ -42,6 +42,7 @@ export class AddonModImscpModuleHandlerService extends CoreModuleHandlerBase imp [CoreConstants.FEATURE_GRADE_OUTCOMES]: false, [CoreConstants.FEATURE_BACKUP_MOODLE2]: true, [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true, + [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_CONTENT, }; /** diff --git a/src/addons/mod/label/services/handlers/module.ts b/src/addons/mod/label/services/handlers/module.ts index f7cc33d6a..ec9ce00a2 100644 --- a/src/addons/mod/label/services/handlers/module.ts +++ b/src/addons/mod/label/services/handlers/module.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { CoreConstants } from '@/core/constants'; +import { CoreConstants, ModPurpose } from '@/core/constants'; import { Injectable } from '@angular/core'; import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler'; import { CoreCourseModuleData } from '@features/course/services/course-helper'; @@ -40,6 +40,7 @@ export class AddonModLabelModuleHandlerService extends CoreModuleHandlerBase imp [CoreConstants.FEATURE_BACKUP_MOODLE2]: true, [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true, [CoreConstants.FEATURE_NO_VIEW_LINK]: true, + [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_CONTENT, }; /** diff --git a/src/addons/mod/lesson/services/handlers/module.ts b/src/addons/mod/lesson/services/handlers/module.ts index 7563848e7..897b65381 100644 --- a/src/addons/mod/lesson/services/handlers/module.ts +++ b/src/addons/mod/lesson/services/handlers/module.ts @@ -14,7 +14,7 @@ import { Injectable, Type } from '@angular/core'; -import { CoreConstants } from '@/core/constants'; +import { CoreConstants, ModPurpose } from '@/core/constants'; import { CoreCourseModuleHandler } from '@features/course/services/module-delegate'; import { AddonModLessonIndexComponent } from '../../components/index'; import { makeSingleton } from '@singletons'; @@ -42,6 +42,7 @@ export class AddonModLessonModuleHandlerService extends CoreModuleHandlerBase im [CoreConstants.FEATURE_GRADE_OUTCOMES]: true, [CoreConstants.FEATURE_BACKUP_MOODLE2]: true, [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true, + [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_CONTENT, }; /** diff --git a/src/addons/mod/lti/services/handlers/module.ts b/src/addons/mod/lti/services/handlers/module.ts index 7dcf9b6ee..7e80a8f53 100644 --- a/src/addons/mod/lti/services/handlers/module.ts +++ b/src/addons/mod/lti/services/handlers/module.ts @@ -14,7 +14,7 @@ import { Injectable, Type } from '@angular/core'; -import { CoreConstants } from '@/core/constants'; +import { CoreConstants, ModPurpose } from '@/core/constants'; import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate'; import { CoreCourseModuleData } from '@features/course/services/course-helper'; import { makeSingleton } from '@singletons'; @@ -43,6 +43,7 @@ export class AddonModLtiModuleHandlerService extends CoreModuleHandlerBase imple [CoreConstants.FEATURE_GRADE_OUTCOMES]: true, [CoreConstants.FEATURE_BACKUP_MOODLE2]: true, [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true, + [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_CONTENT, }; /** diff --git a/src/addons/mod/page/services/handlers/module.ts b/src/addons/mod/page/services/handlers/module.ts index 688d9eabc..9870c74cf 100644 --- a/src/addons/mod/page/services/handlers/module.ts +++ b/src/addons/mod/page/services/handlers/module.ts @@ -15,7 +15,7 @@ import { Injectable, Type } from '@angular/core'; import { AddonModPage } from '../page'; import { CoreCourseModuleHandler } from '@features/course/services/module-delegate'; -import { CoreConstants } from '@/core/constants'; +import { CoreConstants, ModPurpose } from '@/core/constants'; import { AddonModPageIndexComponent } from '../../components/index'; import { makeSingleton } from '@singletons'; import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler'; @@ -42,6 +42,7 @@ export class AddonModPageModuleHandlerService extends CoreModuleHandlerBase impl [CoreConstants.FEATURE_GRADE_OUTCOMES]: false, [CoreConstants.FEATURE_BACKUP_MOODLE2]: true, [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true, + [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_CONTENT, }; /** diff --git a/src/addons/mod/quiz/services/handlers/module.ts b/src/addons/mod/quiz/services/handlers/module.ts index 70cad4de5..7ca4c9022 100644 --- a/src/addons/mod/quiz/services/handlers/module.ts +++ b/src/addons/mod/quiz/services/handlers/module.ts @@ -14,7 +14,7 @@ import { Injectable, Type } from '@angular/core'; -import { CoreConstants } from '@/core/constants'; +import { CoreConstants, ModPurpose } from '@/core/constants'; import { CoreCourseModuleHandler } from '@features/course/services/module-delegate'; import { AddonModQuizIndexComponent } from '../../components/index'; import { makeSingleton } from '@singletons'; @@ -44,6 +44,7 @@ export class AddonModQuizModuleHandlerService extends CoreModuleHandlerBase impl [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true, [CoreConstants.FEATURE_CONTROLS_GRADE_VISIBILITY]: true, [CoreConstants.FEATURE_USES_QUESTIONS]: true, + [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_ASSESSMENT, }; /** diff --git a/src/addons/mod/resource/services/handlers/module.ts b/src/addons/mod/resource/services/handlers/module.ts index 205173fe6..85cc81e0b 100644 --- a/src/addons/mod/resource/services/handlers/module.ts +++ b/src/addons/mod/resource/services/handlers/module.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { CoreConstants } from '@/core/constants'; +import { CoreConstants, ModPurpose } from '@/core/constants'; import { Injectable, Type } from '@angular/core'; import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler'; import { CoreCourse } from '@features/course/services/course'; @@ -50,6 +50,7 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase [CoreConstants.FEATURE_GRADE_OUTCOMES]: false, [CoreConstants.FEATURE_BACKUP_MOODLE2]: true, [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true, + [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_CONTENT, }; /** diff --git a/src/addons/mod/scorm/services/handlers/module.ts b/src/addons/mod/scorm/services/handlers/module.ts index 7996d4921..aacc38544 100644 --- a/src/addons/mod/scorm/services/handlers/module.ts +++ b/src/addons/mod/scorm/services/handlers/module.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { CoreConstants } from '@/core/constants'; +import { CoreConstants, ModPurpose } from '@/core/constants'; import { Injectable, Type } from '@angular/core'; import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler'; import { CoreCourseModuleHandler } from '@features/course/services/module-delegate'; @@ -41,6 +41,7 @@ export class AddonModScormModuleHandlerService extends CoreModuleHandlerBase imp [CoreConstants.FEATURE_GRADE_OUTCOMES]: true, [CoreConstants.FEATURE_BACKUP_MOODLE2]: true, [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true, + [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_CONTENT, }; /** diff --git a/src/addons/mod/survey/services/handlers/module.ts b/src/addons/mod/survey/services/handlers/module.ts index 8ec3f3969..1faa1a25a 100644 --- a/src/addons/mod/survey/services/handlers/module.ts +++ b/src/addons/mod/survey/services/handlers/module.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { CoreConstants } from '@/core/constants'; +import { CoreConstants, ModPurpose } from '@/core/constants'; import { Injectable, Type } from '@angular/core'; import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler'; import { CoreCourseModuleHandler } from '@features/course/services/module-delegate'; @@ -41,6 +41,7 @@ export class AddonModSurveyModuleHandlerService extends CoreModuleHandlerBase im [CoreConstants.FEATURE_GRADE_OUTCOMES]: false, [CoreConstants.FEATURE_BACKUP_MOODLE2]: true, [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true, + [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_COMMUNICATION, }; /** diff --git a/src/addons/mod/url/services/handlers/module.ts b/src/addons/mod/url/services/handlers/module.ts index ed9e30713..8d7adc10e 100644 --- a/src/addons/mod/url/services/handlers/module.ts +++ b/src/addons/mod/url/services/handlers/module.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { CoreConstants } from '@/core/constants'; +import { CoreConstants, ModPurpose } from '@/core/constants'; import { Injectable, Type } from '@angular/core'; import { CoreContentLinksHelper } from '@features/contentlinks/services/contentlinks-helper'; import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler'; @@ -49,6 +49,7 @@ export class AddonModUrlModuleHandlerService extends CoreModuleHandlerBase imple [CoreConstants.FEATURE_GRADE_OUTCOMES]: false, [CoreConstants.FEATURE_BACKUP_MOODLE2]: true, [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true, + [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_CONTENT, }; /** diff --git a/src/addons/mod/wiki/services/handlers/module.ts b/src/addons/mod/wiki/services/handlers/module.ts index 33b5af3aa..3bd58ebd1 100644 --- a/src/addons/mod/wiki/services/handlers/module.ts +++ b/src/addons/mod/wiki/services/handlers/module.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { CoreConstants } from '@/core/constants'; +import { CoreConstants, ModPurpose } from '@/core/constants'; import { Injectable, Type } from '@angular/core'; import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler'; import { CoreCourseModuleHandler } from '@features/course/services/module-delegate'; @@ -42,6 +42,7 @@ export class AddonModWikiModuleHandlerService extends CoreModuleHandlerBase impl [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true, [CoreConstants.FEATURE_RATE]: false, [CoreConstants.FEATURE_COMMENT]: true, + [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_COLLABORATION, }; /** diff --git a/src/addons/mod/workshop/services/handlers/module.ts b/src/addons/mod/workshop/services/handlers/module.ts index 4364cc552..869c347cb 100644 --- a/src/addons/mod/workshop/services/handlers/module.ts +++ b/src/addons/mod/workshop/services/handlers/module.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { CoreConstants } from '@/core/constants'; +import { CoreConstants, ModPurpose } from '@/core/constants'; import { Injectable, Type } from '@angular/core'; import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler'; import { CoreCourseModuleHandler } from '@features/course/services/module-delegate'; @@ -40,6 +40,7 @@ export class AddonModWorkshopModuleHandlerService extends CoreModuleHandlerBase [CoreConstants.FEATURE_BACKUP_MOODLE2]: true, [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true, [CoreConstants.FEATURE_PLAGIARISM]: true, + [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_ASSESSMENT, }; /** diff --git a/src/core/constants.ts b/src/core/constants.ts index a4f6a7c32..2c238261b 100644 --- a/src/core/constants.ts +++ b/src/core/constants.ts @@ -27,6 +27,16 @@ export const enum ContextLevel { BLOCK = 'block', } +export const enum ModPurpose { + MOD_PURPOSE_COMMUNICATION = 'communication', + MOD_PURPOSE_ASSESSMENT = 'assessment', + MOD_PURPOSE_COLLABORATION = 'collaboration', + MOD_PURPOSE_CONTENT = 'content', + MOD_PURPOSE_ADMINISTRATION = 'administration', + MOD_PURPOSE_INTERFACE = 'interface', + MOD_PURPOSE_OTHER = 'other', +}; + /** * Static class to contain all the core constants. */ @@ -119,6 +129,7 @@ export class CoreConstants { static readonly FEATURE_MOD_INTRO = 'mod_intro'; // True if module supports intro editor. static readonly FEATURE_MODEDIT_DEFAULT_COMPLETION = 'modedit_default_completion'; // True if module has default completion. static readonly FEATURE_COMMENT = 'comment'; + static readonly FEATURE_MOD_PURPOSE = 'mod_purpose'; // Type of module. static readonly FEATURE_RATE = 'rate'; static readonly FEATURE_BACKUP_MOODLE2 = 'backup_moodle2'; // True if module supports backup/restore of moodle2 format. static readonly FEATURE_SHOW_DESCRIPTION = 'showdescription'; // True if module can show description on course main page. From 96b172c42ca216aacc986502eb628e5a911d0671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Tue, 18 Jan 2022 12:10:21 +0100 Subject: [PATCH 05/11] MOBILE-3811 resource: Remove mimetype icons from resource --- .../mod/resource/services/handlers/module.ts | 52 ++----------------- 1 file changed, 4 insertions(+), 48 deletions(-) diff --git a/src/addons/mod/resource/services/handlers/module.ts b/src/addons/mod/resource/services/handlers/module.ts index 85cc81e0b..a889ac9ed 100644 --- a/src/addons/mod/resource/services/handlers/module.ts +++ b/src/addons/mod/resource/services/handlers/module.ts @@ -93,9 +93,8 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase }, }]; - this.getResourceData(module, courseId, handlerData).then((data) => { - handlerData.icon = data.icon; - handlerData.extraBadge = data.extra; + this.getResourceData(module, courseId, handlerData).then((extra) => { + handlerData.extraBadge = extra; handlerData.extraBadgeColor = 'light'; return; @@ -133,7 +132,7 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase module: CoreCourseModuleData, courseId: number, handlerData: CoreCourseModuleHandlerData, - ): Promise { + ): Promise { const promises: Promise[] = []; let options: AddonModResourceCustomData = {}; @@ -161,23 +160,15 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase await Promise.all(promises); - let mimetypeIcon = ''; const extra: string[] = []; if (module.contentsinfo) { // No need to use the list of files. - const mimetype = module.contentsinfo.mimetypes[0]; - if (mimetype) { - mimetypeIcon = CoreMimetypeUtils.getMimetypeIcon(mimetype); - } extra.push(CoreTextUtils.cleanTags(module.afterlink)); - } else if (module.contents && module.contents[0]) { const files = module.contents; const file = files[0]; - mimetypeIcon = CoreMimetypeUtils.getFileIcon(file.filename || ''); - if (options.showsize) { const size = options.filedetails ? options.filedetails.size @@ -220,36 +211,7 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase } } - return { - icon: await CoreCourse.getModuleIconSrc(module.modname, module.modicon, mimetypeIcon), - extra: extra.join(' '), - }; - } - - /** - * @inheritdoc - */ - async getIconSrc(module?: CoreCourseModuleData): Promise { - if (!module) { - return; - } - let mimetypeIcon = ''; - - if (module.contentsinfo) { - // No need to use the list of files. - const mimetype = module.contentsinfo.mimetypes[0]; - if (mimetype) { - mimetypeIcon = CoreMimetypeUtils.getMimetypeIcon(mimetype); - } - - } else if (module.contents && module.contents[0]) { - const files = module.contents; - const file = files[0]; - - mimetypeIcon = CoreMimetypeUtils.getFileIcon(file.filename || ''); - } - - return await CoreCourse.getModuleIconSrc(module.modname, module.modicon, mimetypeIcon); + return extra.join(' '); } /** @@ -261,9 +223,3 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase } export const AddonModResourceModuleHandler = makeSingleton(AddonModResourceModuleHandlerService); - -type AddonResourceHandlerData = { - icon: string; - extra: string; -} -; From c7e3e68a945e53af0c622cbfafdb248dbdb0304f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Tue, 18 Jan 2022 14:36:40 +0100 Subject: [PATCH 06/11] MOBILE-3811 bbb: Add purpose and icon on BBB, not definitive --- .../services/handlers/module.ts | 3 +- src/assets/img/mod/bigbluebuttonbn.svg | 70 ++++--------------- 2 files changed, 17 insertions(+), 56 deletions(-) diff --git a/src/addons/mod/bigbluebuttonbn/services/handlers/module.ts b/src/addons/mod/bigbluebuttonbn/services/handlers/module.ts index 3cab8b60f..ee71b6308 100644 --- a/src/addons/mod/bigbluebuttonbn/services/handlers/module.ts +++ b/src/addons/mod/bigbluebuttonbn/services/handlers/module.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { CoreConstants } from '@/core/constants'; +import { CoreConstants, ModPurpose } from '@/core/constants'; import { Injectable, Type } from '@angular/core'; import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler'; import { CoreCourseModuleData } from '@features/course/services/course-helper'; @@ -45,6 +45,7 @@ export class AddonModBBBModuleHandlerService extends CoreModuleHandlerBase imple [CoreConstants.FEATURE_GRADE_OUTCOMES]: true, [CoreConstants.FEATURE_BACKUP_MOODLE2]: true, [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true, + [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_COMMUNICATION, }; /** diff --git a/src/assets/img/mod/bigbluebuttonbn.svg b/src/assets/img/mod/bigbluebuttonbn.svg index 7b92ab21b..94874adeb 100644 --- a/src/assets/img/mod/bigbluebuttonbn.svg +++ b/src/assets/img/mod/bigbluebuttonbn.svg @@ -1,55 +1,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + image/svg+xml + + + + + + + + \ No newline at end of file From e3daf3738cba779cb0760899b79483903a7ccf3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Tue, 18 Jan 2022 14:44:43 +0100 Subject: [PATCH 07/11] MOBILE-3811 core: Improve collapsible header animation --- src/core/components/split-view/split-view.ts | 6 ++---- src/core/directives/collapsible-header.ts | 13 +++++++++++-- src/theme/theme.base.scss | 11 ++++++++--- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/core/components/split-view/split-view.ts b/src/core/components/split-view/split-view.ts index a69cc700c..e535f731d 100644 --- a/src/core/components/split-view/split-view.ts +++ b/src/core/components/split-view/split-view.ts @@ -141,14 +141,12 @@ export class CoreSplitViewComponent implements AfterViewInit, OnDestroy { * Another manual solution is to add scroll-y=false on the ion-contents outside the split view. */ protected disableScrollOnParent(): void { - let outerContent = this.element.nativeElement.parentElement?.closest('ion-content'); - while (outerContent) { + const outerContent = this.element.nativeElement.parentElement?.closest('ion-content'); + if (outerContent) { if (outerContent?.getAttribute('scroll-y') != 'false' && !outerContent?.classList.contains(disabledScrollClass)) { outerContent.classList.add(disabledScrollClass); this.disabledScrollOuterContents.push(outerContent); } - - outerContent = outerContent.parentElement?.closest('ion-content'); } } diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts index 0249849c3..24ba81a03 100644 --- a/src/core/directives/collapsible-header.ts +++ b/src/core/directives/collapsible-header.ts @@ -44,7 +44,7 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy { protected contentSubHeadingFontSize = 0; protected subHeadingStartDifference = 0; - constructor(el: ElementRef) { + constructor(el: ElementRef) { this.header = el.nativeElement; this.loadingObserver = CoreEvents.on(CoreEvents.CORE_LOADING_CHANGED, async (data) => { @@ -122,6 +122,11 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy { } this.titleTopDifference = contentH1.getBoundingClientRect().top - headerH1.getBoundingClientRect().top; + if (this.titleTopDifference <= 0) { + this.cannotCollapse(); + + return; + } // Split view part. const contentAux = this.header.parentElement?.querySelector('ion-content.disable-scroll-y'); @@ -210,7 +215,9 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy { this.content.scrollEvents = true; this.content.addEventListener('ionScroll', (e: CustomEvent): void => { - this.onScroll(title, contentH1, contentSubHeading, e.detail); + if (e.target == this.content) { + this.onScroll(title, contentH1, contentSubHeading, e.detail); + } }); } @@ -234,6 +241,8 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy { this.header.classList.toggle('core-header-collapsed', collapsed); title.classList.toggle('collapsible-title-collapsed', collapsed); title.classList.toggle('collapsible-title-collapse-started', scrollDetail.scrollTop > 0); + title.classList.toggle('collapsible-title-collapse-nowrap', progress > 0.5); + title.style.setProperty('--collapse-opacity', (1 - progress) +''); if (collapsed) { contentH1.style.transform = 'translateX(-' + this.h1StartDifference + 'px)'; diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss index c045c2469..fa122a16c 100644 --- a/src/theme/theme.base.scss +++ b/src/theme/theme.base.scss @@ -1257,21 +1257,26 @@ ion-app.md .collapsible-title h1 { } .collapsible-title.collapsible-title-collapsed { - ion-label, h1, h2, .subheading { + ion-label, h1, h2, ion-row, ion-col, .subheading { opacity: 0; } } .collapsible-title.collapsible-title-collapse-started { * { - opacity: 0; + opacity: var(--collapse-opacity, 0); } - ion-label, h1, h2, .subheading { + + ion-label, h1, h2, ion-row, ion-col, .subheading { opacity: 1; } +} + +.collapsible-title.collapsible-title-collapse-nowrap { h1, h2, .subheading { max-width: var(--max-width); white-space: nowrap; overflow: hidden; + text-overflow: ellipsis; } } From 18db3c58b6466698ebc49fb61b4e6d65daa08863 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Tue, 18 Jan 2022 14:49:44 +0100 Subject: [PATCH 08/11] MOBILE-3811 calendar: Improve calendar visualization --- src/addons/calendar/calendar-common.scss | 8 +- .../calendar/addon-calendar-calendar.html | 5 +- .../components/calendar/calendar.scss | 11 -- src/addons/calendar/pages/day/day.html | 2 +- src/addons/calendar/pages/event/event.html | 167 +++++++++--------- src/addons/calendar/pages/event/event.page.ts | 2 +- src/addons/calendar/pages/event/event.scss | 5 - 7 files changed, 93 insertions(+), 107 deletions(-) diff --git a/src/addons/calendar/calendar-common.scss b/src/addons/calendar/calendar-common.scss index 8fdaaeefe..c12303e90 100644 --- a/src/addons/calendar/calendar-common.scss +++ b/src/addons/calendar/calendar-common.scss @@ -6,11 +6,7 @@ > ion-icon { color: white; border-radius: 50%; - padding: 6px; - } - - > core-mod-icon { - padding: 6px; + padding: 0.7rem; } &.addon-calendar-eventtype-category > ion-icon { @@ -30,4 +26,4 @@ } } -} \ No newline at end of file +} diff --git a/src/addons/calendar/components/calendar/addon-calendar-calendar.html b/src/addons/calendar/components/calendar/addon-calendar-calendar.html index ca1e7dc08..9d072a910 100644 --- a/src/addons/calendar/components/calendar/addon-calendar-calendar.html +++ b/src/addons/calendar/components/calendar/addon-calendar-calendar.html @@ -81,13 +81,10 @@ {{ event.timestart * 1000 | coreFormatDate: timeFormat }} - - {{ 'addon.calendar.type' + event.formattedType | translate }} - + {{ event.iconTitle }} diff --git a/src/addons/calendar/components/calendar/calendar.scss b/src/addons/calendar/components/calendar/calendar.scss index 24e0c2e99..f293233fc 100644 --- a/src/addons/calendar/components/calendar/calendar.scss +++ b/src/addons/calendar/components/calendar/calendar.scss @@ -148,17 +148,6 @@ } } - core-mod-icon { - margin-right: 1px; - margin-left: 1px; - --size: 16px; - display: inline-block; - vertical-align: bottom; - ::ng-deep img { - display: block; - } - } - ion-slide { display: block; font-size: inherit; diff --git a/src/addons/calendar/pages/day/day.html b/src/addons/calendar/pages/day/day.html index 01a7daceb..62939f984 100644 --- a/src/addons/calendar/pages/day/day.html +++ b/src/addons/calendar/pages/day/day.html @@ -68,7 +68,7 @@ (click)="gotoEvent(event.id)" [class.item-dimmed]="event.ispast" [ngClass]="['addon-calendar-eventtype-'+event.eventtype]" button detail="true"> + [modname]="event.modulename" [componentId]="event.instance"> - - - - -

{{ 'addon.calendar.when' | translate }}

- + + + + + + + {{ 'addon.calendar.type' + event.formattedType | translate }} + {{ event.iconTitle }} + +

+ + +

+ + + + +

{{ 'addon.calendar.when' | translate }}

+ + + + {{ 'core.deletedoffline' | translate }} + + + + +

{{ 'addon.calendar.eventtype' | translate }}

+

{{ 'addon.calendar.type' + event.formattedType | translate }}

+ + + + +

{{ 'core.course' | translate}}

+

+ + +

+ + + + +

{{ 'core.group' | translate}}

+

{{ groupName }}

+ + + + +

{{ 'core.category' | translate}}

+

+ + +

+ + + + +

{{ 'core.description' | translate}}

+

+ - - - {{ 'core.deletedoffline' | translate }} - - - - -

{{ 'addon.calendar.eventtype' | translate }}

-

{{ 'addon.calendar.type' + event.formattedType | translate }}

- - - - -

{{ 'core.course' | translate}}

-

- - -

- - - - -

{{ 'core.group' | translate}}

-

{{ groupName }}

- - - - -

{{ 'core.category' | translate}}

-

- - -

- - - - -

{{ 'core.description' | translate}}

-

- + + + + +

{{ 'core.location' | translate}}

+

+ + -

- - - - -

{{ 'core.location' | translate}}

-

- - - -

- - - - - - {{ 'addon.calendar.gotoactivity' | translate }} - - - - - + +

+ + + + + + {{ 'addon.calendar.gotoactivity' | translate }} + + + + - +

{{ 'addon.calendar.reminders' | translate }}

diff --git a/src/addons/calendar/pages/event/event.page.ts b/src/addons/calendar/pages/event/event.page.ts index e335e6b78..28c5de7e9 100644 --- a/src/addons/calendar/pages/event/event.page.ts +++ b/src/addons/calendar/pages/event/event.page.ts @@ -46,7 +46,7 @@ import { AddonCalendarReminderTimeModalComponent } from '@addons/calendar/compon @Component({ selector: 'page-addon-calendar-event', templateUrl: 'event.html', - styleUrls: ['event.scss'], + styleUrls: ['../../calendar-common.scss', 'event.scss'], }) export class AddonCalendarEventPage implements OnInit, OnDestroy { diff --git a/src/addons/calendar/pages/event/event.scss b/src/addons/calendar/pages/event/event.scss index 5403de162..24e862cd4 100644 --- a/src/addons/calendar/pages/event/event.scss +++ b/src/addons/calendar/pages/event/event.scss @@ -2,9 +2,4 @@ ion-card ion-note { font-size: 1.6rem; } - h1 ion-icon, h1 img, h1 core-mod-icon { - margin-left: 10px; - margin-right: 10px; - display: inline-block; - } } From f7010db09146000bf1b890cbb72eeff470a2fad6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Tue, 18 Jan 2022 16:26:30 +0100 Subject: [PATCH 09/11] MOBILE-3811 icon: Adapt new icons on all views --- .../block/timeline/components/events/events.scss | 1 + src/core/components/mod-icon/mod-icon.scss | 11 +++++------ src/core/features/grades/pages/course/course.scss | 1 + src/core/features/sitehome/pages/index/index.scss | 11 +++++++++++ src/core/features/sitehome/pages/index/index.ts | 1 + 5 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 src/core/features/sitehome/pages/index/index.scss diff --git a/src/addons/block/timeline/components/events/events.scss b/src/addons/block/timeline/components/events/events.scss index 8ea49fcb1..8be5516b3 100644 --- a/src/addons/block/timeline/components/events/events.scss +++ b/src/addons/block/timeline/components/events/events.scss @@ -19,6 +19,7 @@ h4.core-bold { .addon-block-timeline-activity core-mod-icon { --margin-end: 0.5rem; + --margin-vertical: 0; } .addon-block-timeline-activity-time, diff --git a/src/core/components/mod-icon/mod-icon.scss b/src/core/components/mod-icon/mod-icon.scss index a5b781a26..7cac89699 100644 --- a/src/core/components/mod-icon/mod-icon.scss +++ b/src/core/components/mod-icon/mod-icon.scss @@ -1,16 +1,19 @@ @import "~theme/globals"; :host { + display: inline-block; --size: var(--module-icon-size); --margin-end: 0px; --margin-vertical: 0px; margin-top: var(--margin-vertical); margin-bottom: var(--margin-vertical); - margin-right: var(--margin-end); + @include margin-horizontal(null, var(--margin-end)); + border-radius: 4px; padding: 0.7rem; background-color: $gray-lighter; + line-height: var(--size); @each $type, $value in $activity-icon-colors { &.#{$type} { @@ -28,6 +31,7 @@ img { height: var(--size); max-width: var(--size); max-height: var(--size); + vertical-align: top; &[alt] { text-indent: -999999px; @@ -45,8 +49,3 @@ img { --margin-vertical: 12px; --margin-end: 12px; } - -:host-context([dir=rtl]) { - margin-right: unset; - margin-left: var(--margin-end); -} diff --git a/src/core/features/grades/pages/course/course.scss b/src/core/features/grades/pages/course/course.scss index 3a004d4a6..8f3299ff6 100644 --- a/src/core/features/grades/pages/course/course.scss +++ b/src/core/features/grades/pages/course/course.scss @@ -87,6 +87,7 @@ } core-mod-icon { + padding: 0.1rem; --size: 16px; } diff --git a/src/core/features/sitehome/pages/index/index.scss b/src/core/features/sitehome/pages/index/index.scss new file mode 100644 index 000000000..90dc443cc --- /dev/null +++ b/src/core/features/sitehome/pages/index/index.scss @@ -0,0 +1,11 @@ +@import "~theme/globals"; + +ion-item ion-icon { + display: inline-block; + border-radius: 4px; + padding: 0.7rem; + background-color: $gray-lighter; + line-height: var(--size); + --margin-end: 1rem; + @include margin-horizontal(null, var(--margin-end)); +} diff --git a/src/core/features/sitehome/pages/index/index.ts b/src/core/features/sitehome/pages/index/index.ts index b28c7d648..b880324d4 100644 --- a/src/core/features/sitehome/pages/index/index.ts +++ b/src/core/features/sitehome/pages/index/index.ts @@ -36,6 +36,7 @@ import { CoreUtils } from '@services/utils/utils'; @Component({ selector: 'page-core-sitehome-index', templateUrl: 'index.html', + styleUrls: ['index.scss'], }) export class CoreSiteHomeIndexPage implements OnInit, OnDestroy { From ed1d8ef2d41c1f3ccc84ee37e9a47623791b4547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Wed, 19 Jan 2022 10:23:27 +0100 Subject: [PATCH 10/11] MOBILE-3811 assets: Minimize svg with svgo vscode extension --- .../img/completion/completion-auto-fail.svg | 19 +- .../completion/completion-auto-n-override.svg | 4 +- .../img/completion/completion-auto-n.svg | 16 +- .../img/completion/completion-auto-pass.svg | 18 +- .../completion/completion-auto-y-override.svg | 4 +- .../img/completion/completion-auto-y.svg | 18 +- .../completion-manual-n-override.svg | 4 +- .../img/completion/completion-manual-n.svg | 15 +- .../completion-manual-y-override.svg | 4 +- .../img/completion/completion-manual-y.svg | 18 +- src/assets/img/icons/activities.svg | 179 +------ src/assets/img/icons/courses.svg | 258 +--------- src/assets/img/icons/empty.svg | 4 +- src/assets/img/icons/h5p.svg | 15 +- src/assets/img/mod/assign.svg | 11 +- src/assets/img/mod/bigbluebuttonbn.svg | 16 +- src/assets/img/mod/book.svg | 12 +- src/assets/img/mod/chat.svg | 13 +- src/assets/img/mod/choice.svg | 15 +- src/assets/img/mod/data.svg | 19 +- src/assets/img/mod/external-tool.svg | 15 +- src/assets/img/mod/feedback.svg | 17 +- src/assets/img/mod/folder.svg | 9 +- src/assets/img/mod/forum.svg | 18 +- src/assets/img/mod/glossary.svg | 10 +- src/assets/img/mod/h5pactivity.svg | 17 +- src/assets/img/mod/imscp.svg | 19 +- src/assets/img/mod/label.svg | 15 +- src/assets/img/mod/lesson.svg | 16 +- src/assets/img/mod/lti.svg | 15 +- src/assets/img/mod/page.svg | 14 +- src/assets/img/mod/quiz.svg | 12 +- src/assets/img/mod/resource.svg | 11 +- src/assets/img/mod/scorm.svg | 9 +- src/assets/img/mod/survey.svg | 14 +- src/assets/img/mod/url.svg | 18 +- src/assets/img/mod/wiki.svg | 26 +- src/assets/img/mod/workshop.svg | 20 +- src/assets/img/mod_legacy/assign.svg | 90 +--- src/assets/img/mod_legacy/bigbluebuttonbn.svg | 56 +- src/assets/img/mod_legacy/book.svg | 81 +-- src/assets/img/mod_legacy/chat.svg | 78 +-- src/assets/img/mod_legacy/choice.svg | 47 +- src/assets/img/mod_legacy/data.svg | 88 +--- src/assets/img/mod_legacy/external-tool.svg | 56 +- src/assets/img/mod_legacy/feedback.svg | 134 +---- src/assets/img/mod_legacy/folder.svg | 66 +-- src/assets/img/mod_legacy/forum.svg | 72 +-- src/assets/img/mod_legacy/glossary.svg | 147 +----- src/assets/img/mod_legacy/imscp.svg | 157 +----- src/assets/img/mod_legacy/label.svg | 95 +--- src/assets/img/mod_legacy/lesson.svg | 127 +---- src/assets/img/mod_legacy/lti.svg | 56 +- src/assets/img/mod_legacy/page.svg | 113 +--- src/assets/img/mod_legacy/quiz.svg | 91 +--- src/assets/img/mod_legacy/resource.svg | 61 +-- src/assets/img/mod_legacy/scorm.svg | 85 +-- src/assets/img/mod_legacy/survey.svg | 90 +--- src/assets/img/mod_legacy/url.svg | 486 +----------------- src/assets/img/mod_legacy/wiki.svg | 229 +-------- src/assets/img/mod_legacy/workshop.svg | 99 +--- 61 files changed, 61 insertions(+), 3480 deletions(-) diff --git a/src/assets/img/completion/completion-auto-fail.svg b/src/assets/img/completion/completion-auto-fail.svg index 771adf36f..68a8e5c37 100644 --- a/src/assets/img/completion/completion-auto-fail.svg +++ b/src/assets/img/completion/completion-auto-fail.svg @@ -1,18 +1 @@ - - - -]> - - - - - - + diff --git a/src/assets/img/completion/completion-auto-n-override.svg b/src/assets/img/completion/completion-auto-n-override.svg index 6100638d0..bffccb8b8 100644 --- a/src/assets/img/completion/completion-auto-n-override.svg +++ b/src/assets/img/completion/completion-auto-n-override.svg @@ -1,3 +1 @@ - -]> \ No newline at end of file + height="16" viewBox="0 0 16 16" preserveAspectRatio="xMinYMid meet" overflow="visible"> diff --git a/src/assets/img/completion/completion-auto-n.svg b/src/assets/img/completion/completion-auto-n.svg index 6a8bc6222..fa977d2f8 100644 --- a/src/assets/img/completion/completion-auto-n.svg +++ b/src/assets/img/completion/completion-auto-n.svg @@ -1,15 +1 @@ - - - -]> - - - - - + diff --git a/src/assets/img/completion/completion-auto-pass.svg b/src/assets/img/completion/completion-auto-pass.svg index 44df83f15..323f4fe0e 100644 --- a/src/assets/img/completion/completion-auto-pass.svg +++ b/src/assets/img/completion/completion-auto-pass.svg @@ -1,17 +1 @@ - - - -]> - - - - - - + diff --git a/src/assets/img/completion/completion-auto-y-override.svg b/src/assets/img/completion/completion-auto-y-override.svg index 13cf5d700..375e13266 100644 --- a/src/assets/img/completion/completion-auto-y-override.svg +++ b/src/assets/img/completion/completion-auto-y-override.svg @@ -1,3 +1 @@ - -]> \ No newline at end of file + height="16" viewBox="0 0 16 16" preserveAspectRatio="xMinYMid meet" overflow="visible"> diff --git a/src/assets/img/completion/completion-auto-y.svg b/src/assets/img/completion/completion-auto-y.svg index 14822e173..a565c8061 100644 --- a/src/assets/img/completion/completion-auto-y.svg +++ b/src/assets/img/completion/completion-auto-y.svg @@ -1,17 +1 @@ - - - -]> - - - - - - + diff --git a/src/assets/img/completion/completion-manual-n-override.svg b/src/assets/img/completion/completion-manual-n-override.svg index cccfb99cd..9b929eafd 100644 --- a/src/assets/img/completion/completion-manual-n-override.svg +++ b/src/assets/img/completion/completion-manual-n-override.svg @@ -1,3 +1 @@ - -]> \ No newline at end of file + height="16" viewBox="0 0 16 16" preserveAspectRatio="xMinYMid meet" overflow="visible"> diff --git a/src/assets/img/completion/completion-manual-n.svg b/src/assets/img/completion/completion-manual-n.svg index f7750e25a..1503bed2e 100644 --- a/src/assets/img/completion/completion-manual-n.svg +++ b/src/assets/img/completion/completion-manual-n.svg @@ -1,14 +1 @@ - - - -]> - - - - - + diff --git a/src/assets/img/completion/completion-manual-y-override.svg b/src/assets/img/completion/completion-manual-y-override.svg index 69270ba3e..849e3efc9 100644 --- a/src/assets/img/completion/completion-manual-y-override.svg +++ b/src/assets/img/completion/completion-manual-y-override.svg @@ -1,3 +1 @@ - -]> \ No newline at end of file + height="16" viewBox="0 0 16 16" preserveAspectRatio="xMinYMid meet" overflow="visible"> diff --git a/src/assets/img/completion/completion-manual-y.svg b/src/assets/img/completion/completion-manual-y.svg index 3b91bdbc7..771006579 100644 --- a/src/assets/img/completion/completion-manual-y.svg +++ b/src/assets/img/completion/completion-manual-y.svg @@ -1,17 +1 @@ - - - -]> - - - - - - + diff --git a/src/assets/img/icons/activities.svg b/src/assets/img/icons/activities.svg index 56243a53c..73ae35859 100644 --- a/src/assets/img/icons/activities.svg +++ b/src/assets/img/icons/activities.svg @@ -1,178 +1 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/assets/img/icons/courses.svg b/src/assets/img/icons/courses.svg index 7bd9cb672..3f8e18b48 100644 --- a/src/assets/img/icons/courses.svg +++ b/src/assets/img/icons/courses.svg @@ -1,257 +1 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/assets/img/icons/empty.svg b/src/assets/img/icons/empty.svg index a16fb7460..d13e2fd95 100644 --- a/src/assets/img/icons/empty.svg +++ b/src/assets/img/icons/empty.svg @@ -1,3 +1 @@ - -]> \ No newline at end of file + height="16" viewBox="0 0 16 16" preserveAspectRatio="xMinYMid meet" overflow="visible"> diff --git a/src/assets/img/icons/h5p.svg b/src/assets/img/icons/h5p.svg index 7856f9efb..1cb7a0ccc 100644 --- a/src/assets/img/icons/h5p.svg +++ b/src/assets/img/icons/h5p.svg @@ -1,14 +1 @@ - - - - - - - - + diff --git a/src/assets/img/mod/assign.svg b/src/assets/img/mod/assign.svg index 18fea36dd..6721bd13a 100644 --- a/src/assets/img/mod/assign.svg +++ b/src/assets/img/mod/assign.svg @@ -1,10 +1 @@ - - - - - + diff --git a/src/assets/img/mod/bigbluebuttonbn.svg b/src/assets/img/mod/bigbluebuttonbn.svg index 94874adeb..57fcc9ecf 100644 --- a/src/assets/img/mod/bigbluebuttonbn.svg +++ b/src/assets/img/mod/bigbluebuttonbn.svg @@ -1,15 +1 @@ - - - - - - - image/svg+xml - - - - - - - - \ No newline at end of file + diff --git a/src/assets/img/mod/book.svg b/src/assets/img/mod/book.svg index 994edc734..3c43cad61 100644 --- a/src/assets/img/mod/book.svg +++ b/src/assets/img/mod/book.svg @@ -1,11 +1 @@ - - - - - + diff --git a/src/assets/img/mod/chat.svg b/src/assets/img/mod/chat.svg index 52efce452..f6ec94d25 100644 --- a/src/assets/img/mod/chat.svg +++ b/src/assets/img/mod/chat.svg @@ -1,12 +1 @@ - - - - - + diff --git a/src/assets/img/mod/choice.svg b/src/assets/img/mod/choice.svg index 02905029c..e81b8f5c5 100644 --- a/src/assets/img/mod/choice.svg +++ b/src/assets/img/mod/choice.svg @@ -1,14 +1 @@ - - - - - + diff --git a/src/assets/img/mod/data.svg b/src/assets/img/mod/data.svg index 3bf47aa86..66f3a996b 100644 --- a/src/assets/img/mod/data.svg +++ b/src/assets/img/mod/data.svg @@ -1,18 +1 @@ - - - - - + diff --git a/src/assets/img/mod/external-tool.svg b/src/assets/img/mod/external-tool.svg index cc70c5de9..ff362e431 100644 --- a/src/assets/img/mod/external-tool.svg +++ b/src/assets/img/mod/external-tool.svg @@ -1,14 +1 @@ - - - - - + diff --git a/src/assets/img/mod/feedback.svg b/src/assets/img/mod/feedback.svg index e4f8916f6..7fa5f02c5 100644 --- a/src/assets/img/mod/feedback.svg +++ b/src/assets/img/mod/feedback.svg @@ -1,16 +1 @@ - - - - - - - - - - + diff --git a/src/assets/img/mod/folder.svg b/src/assets/img/mod/folder.svg index e8dd12e1a..9ad8f814f 100644 --- a/src/assets/img/mod/folder.svg +++ b/src/assets/img/mod/folder.svg @@ -1,8 +1 @@ - - - - - + diff --git a/src/assets/img/mod/forum.svg b/src/assets/img/mod/forum.svg index defe1015d..c1dbbb7ee 100644 --- a/src/assets/img/mod/forum.svg +++ b/src/assets/img/mod/forum.svg @@ -1,17 +1 @@ - - - - - - - - - - + diff --git a/src/assets/img/mod/glossary.svg b/src/assets/img/mod/glossary.svg index 465bc2dcd..e77fa85ad 100644 --- a/src/assets/img/mod/glossary.svg +++ b/src/assets/img/mod/glossary.svg @@ -1,9 +1 @@ - - - - - + diff --git a/src/assets/img/mod/h5pactivity.svg b/src/assets/img/mod/h5pactivity.svg index d76a924d5..0dddac960 100644 --- a/src/assets/img/mod/h5pactivity.svg +++ b/src/assets/img/mod/h5pactivity.svg @@ -1,16 +1 @@ - - - - - - - - + diff --git a/src/assets/img/mod/imscp.svg b/src/assets/img/mod/imscp.svg index 30705d0a2..87f31fd32 100644 --- a/src/assets/img/mod/imscp.svg +++ b/src/assets/img/mod/imscp.svg @@ -1,18 +1 @@ - - - - - - - - - - - + diff --git a/src/assets/img/mod/label.svg b/src/assets/img/mod/label.svg index b2494df89..49db2f821 100644 --- a/src/assets/img/mod/label.svg +++ b/src/assets/img/mod/label.svg @@ -1,14 +1 @@ - - - - - - - + diff --git a/src/assets/img/mod/lesson.svg b/src/assets/img/mod/lesson.svg index 80ddee00b..12d1824e7 100644 --- a/src/assets/img/mod/lesson.svg +++ b/src/assets/img/mod/lesson.svg @@ -1,15 +1 @@ - - - - - + diff --git a/src/assets/img/mod/lti.svg b/src/assets/img/mod/lti.svg index cc70c5de9..ff362e431 100644 --- a/src/assets/img/mod/lti.svg +++ b/src/assets/img/mod/lti.svg @@ -1,14 +1 @@ - - - - - + diff --git a/src/assets/img/mod/page.svg b/src/assets/img/mod/page.svg index 83751046f..0a202805e 100644 --- a/src/assets/img/mod/page.svg +++ b/src/assets/img/mod/page.svg @@ -1,13 +1 @@ - - - - - - - - - - + diff --git a/src/assets/img/mod/quiz.svg b/src/assets/img/mod/quiz.svg index 26cb7dda7..04aaadfc8 100644 --- a/src/assets/img/mod/quiz.svg +++ b/src/assets/img/mod/quiz.svg @@ -1,11 +1 @@ - - - - - - - - + diff --git a/src/assets/img/mod/resource.svg b/src/assets/img/mod/resource.svg index fde303973..e123e7470 100644 --- a/src/assets/img/mod/resource.svg +++ b/src/assets/img/mod/resource.svg @@ -1,10 +1 @@ - - - - - - - + diff --git a/src/assets/img/mod/scorm.svg b/src/assets/img/mod/scorm.svg index 76ec9c64f..95d97e0dd 100644 --- a/src/assets/img/mod/scorm.svg +++ b/src/assets/img/mod/scorm.svg @@ -1,8 +1 @@ - - - - - + diff --git a/src/assets/img/mod/survey.svg b/src/assets/img/mod/survey.svg index 61e63e52b..a99aa548f 100644 --- a/src/assets/img/mod/survey.svg +++ b/src/assets/img/mod/survey.svg @@ -1,13 +1 @@ - - - - - - - - - + diff --git a/src/assets/img/mod/url.svg b/src/assets/img/mod/url.svg index eb00b261c..fe096966e 100644 --- a/src/assets/img/mod/url.svg +++ b/src/assets/img/mod/url.svg @@ -1,17 +1 @@ - - - - - + diff --git a/src/assets/img/mod/wiki.svg b/src/assets/img/mod/wiki.svg index ff8eddd32..9c4ff6281 100644 --- a/src/assets/img/mod/wiki.svg +++ b/src/assets/img/mod/wiki.svg @@ -1,25 +1 @@ - - - - - + diff --git a/src/assets/img/mod/workshop.svg b/src/assets/img/mod/workshop.svg index 594cfa205..ed7652eb3 100644 --- a/src/assets/img/mod/workshop.svg +++ b/src/assets/img/mod/workshop.svg @@ -1,19 +1 @@ - - - - - - - - - - + diff --git a/src/assets/img/mod_legacy/assign.svg b/src/assets/img/mod_legacy/assign.svg index 41a788985..9cfeda3d0 100644 --- a/src/assets/img/mod_legacy/assign.svg +++ b/src/assets/img/mod_legacy/assign.svg @@ -1,89 +1 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/assets/img/mod_legacy/bigbluebuttonbn.svg b/src/assets/img/mod_legacy/bigbluebuttonbn.svg index 7b92ab21b..91214c8d0 100644 --- a/src/assets/img/mod_legacy/bigbluebuttonbn.svg +++ b/src/assets/img/mod_legacy/bigbluebuttonbn.svg @@ -1,55 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/assets/img/mod_legacy/book.svg b/src/assets/img/mod_legacy/book.svg index 740a35160..282ceffe2 100644 --- a/src/assets/img/mod_legacy/book.svg +++ b/src/assets/img/mod_legacy/book.svg @@ -1,80 +1 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/assets/img/mod_legacy/chat.svg b/src/assets/img/mod_legacy/chat.svg index 9dd304b78..08f9062fc 100644 --- a/src/assets/img/mod_legacy/chat.svg +++ b/src/assets/img/mod_legacy/chat.svg @@ -1,77 +1 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/assets/img/mod_legacy/choice.svg b/src/assets/img/mod_legacy/choice.svg index 4d455910c..a7a500299 100644 --- a/src/assets/img/mod_legacy/choice.svg +++ b/src/assets/img/mod_legacy/choice.svg @@ -1,46 +1 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/assets/img/mod_legacy/data.svg b/src/assets/img/mod_legacy/data.svg index 954777f09..43063536f 100644 --- a/src/assets/img/mod_legacy/data.svg +++ b/src/assets/img/mod_legacy/data.svg @@ -1,87 +1 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/assets/img/mod_legacy/external-tool.svg b/src/assets/img/mod_legacy/external-tool.svg index ebbbe3084..286a99aee 100644 --- a/src/assets/img/mod_legacy/external-tool.svg +++ b/src/assets/img/mod_legacy/external-tool.svg @@ -1,55 +1 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/assets/img/mod_legacy/feedback.svg b/src/assets/img/mod_legacy/feedback.svg index 58d0f080b..79736bb7e 100644 --- a/src/assets/img/mod_legacy/feedback.svg +++ b/src/assets/img/mod_legacy/feedback.svg @@ -1,133 +1 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/assets/img/mod_legacy/folder.svg b/src/assets/img/mod_legacy/folder.svg index 6c2a9fe19..e6ddbc4c4 100644 --- a/src/assets/img/mod_legacy/folder.svg +++ b/src/assets/img/mod_legacy/folder.svg @@ -1,65 +1 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/assets/img/mod_legacy/forum.svg b/src/assets/img/mod_legacy/forum.svg index aab9a8f44..392a8ba9d 100644 --- a/src/assets/img/mod_legacy/forum.svg +++ b/src/assets/img/mod_legacy/forum.svg @@ -1,71 +1 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/assets/img/mod_legacy/glossary.svg b/src/assets/img/mod_legacy/glossary.svg index f330727e3..f56f9fa31 100644 --- a/src/assets/img/mod_legacy/glossary.svg +++ b/src/assets/img/mod_legacy/glossary.svg @@ -1,146 +1 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/assets/img/mod_legacy/imscp.svg b/src/assets/img/mod_legacy/imscp.svg index 5589cd0c5..f5ccbebaf 100644 --- a/src/assets/img/mod_legacy/imscp.svg +++ b/src/assets/img/mod_legacy/imscp.svg @@ -1,156 +1 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/assets/img/mod_legacy/label.svg b/src/assets/img/mod_legacy/label.svg index ac232fc58..c42c26477 100644 --- a/src/assets/img/mod_legacy/label.svg +++ b/src/assets/img/mod_legacy/label.svg @@ -1,94 +1 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/assets/img/mod_legacy/lesson.svg b/src/assets/img/mod_legacy/lesson.svg index 0a0e5dfd5..f32d1630f 100644 --- a/src/assets/img/mod_legacy/lesson.svg +++ b/src/assets/img/mod_legacy/lesson.svg @@ -1,126 +1 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/assets/img/mod_legacy/lti.svg b/src/assets/img/mod_legacy/lti.svg index ebbbe3084..286a99aee 100644 --- a/src/assets/img/mod_legacy/lti.svg +++ b/src/assets/img/mod_legacy/lti.svg @@ -1,55 +1 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/assets/img/mod_legacy/page.svg b/src/assets/img/mod_legacy/page.svg index eb7cae6c8..2126b6897 100644 --- a/src/assets/img/mod_legacy/page.svg +++ b/src/assets/img/mod_legacy/page.svg @@ -1,112 +1 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/assets/img/mod_legacy/quiz.svg b/src/assets/img/mod_legacy/quiz.svg index 90473416f..d4de83074 100644 --- a/src/assets/img/mod_legacy/quiz.svg +++ b/src/assets/img/mod_legacy/quiz.svg @@ -1,90 +1 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/assets/img/mod_legacy/resource.svg b/src/assets/img/mod_legacy/resource.svg index 2039a2ea2..3ee9bbe05 100644 --- a/src/assets/img/mod_legacy/resource.svg +++ b/src/assets/img/mod_legacy/resource.svg @@ -1,60 +1 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/assets/img/mod_legacy/scorm.svg b/src/assets/img/mod_legacy/scorm.svg index 77891eca4..4d5617e2b 100644 --- a/src/assets/img/mod_legacy/scorm.svg +++ b/src/assets/img/mod_legacy/scorm.svg @@ -1,84 +1 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/assets/img/mod_legacy/survey.svg b/src/assets/img/mod_legacy/survey.svg index a97fe77ef..2bbc36f81 100644 --- a/src/assets/img/mod_legacy/survey.svg +++ b/src/assets/img/mod_legacy/survey.svg @@ -1,89 +1 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/assets/img/mod_legacy/url.svg b/src/assets/img/mod_legacy/url.svg index 56bdb5541..94c07d48b 100644 --- a/src/assets/img/mod_legacy/url.svg +++ b/src/assets/img/mod_legacy/url.svg @@ -1,485 +1 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/assets/img/mod_legacy/wiki.svg b/src/assets/img/mod_legacy/wiki.svg index f3101ce19..e8c0e9f48 100644 --- a/src/assets/img/mod_legacy/wiki.svg +++ b/src/assets/img/mod_legacy/wiki.svg @@ -1,228 +1 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/assets/img/mod_legacy/workshop.svg b/src/assets/img/mod_legacy/workshop.svg index f466455a6..570537727 100644 --- a/src/assets/img/mod_legacy/workshop.svg +++ b/src/assets/img/mod_legacy/workshop.svg @@ -1,98 +1 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + From f29558d35b31b9e0d884753981e7f9dfabdc0770 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Wed, 19 Jan 2022 10:23:34 +0100 Subject: [PATCH 11/11] MOBILE-3811 assets: Add svg versions of some assets --- .../conversation-info/conversation-info.html | 2 +- .../messages/pages/discussion/discussion.html | 2 +- .../group-conversations/group-conversations.html | 2 +- src/assets/img/grades/agg_mean.png | Bin 341 -> 0 bytes src/assets/img/grades/agg_mean.svg | 1 + src/assets/img/grades/agg_sum.png | Bin 318 -> 0 bytes src/assets/img/grades/agg_sum.svg | 1 + src/assets/img/group-avatar.png | Bin 972 -> 0 bytes src/assets/img/group-avatar.svg | 1 + .../features/grades/services/grades-helper.ts | 6 +++--- 10 files changed, 9 insertions(+), 6 deletions(-) delete mode 100644 src/assets/img/grades/agg_mean.png create mode 100644 src/assets/img/grades/agg_mean.svg delete mode 100644 src/assets/img/grades/agg_sum.png create mode 100644 src/assets/img/grades/agg_sum.svg delete mode 100644 src/assets/img/group-avatar.png create mode 100644 src/assets/img/group-avatar.svg diff --git a/src/addons/messages/components/conversation-info/conversation-info.html b/src/addons/messages/components/conversation-info/conversation-info.html index 59f120624..c72e7b344 100644 --- a/src/addons/messages/components/conversation-info/conversation-info.html +++ b/src/addons/messages/components/conversation-info/conversation-info.html @@ -20,7 +20,7 @@
+ onError="this.src='assets/img/group-avatar.svg'">

diff --git a/src/addons/messages/pages/discussion/discussion.html b/src/addons/messages/pages/discussion/discussion.html index 06978fd47..2c85e5dbd 100644 --- a/src/addons/messages/pages/discussion/discussion.html +++ b/src/addons/messages/pages/discussion/discussion.html @@ -6,7 +6,7 @@

+ onError="this.src='assets/img/group-avatar.svg'" core-external-content role="presentation" [siteId]="siteId || null"> diff --git a/src/addons/messages/pages/group-conversations/group-conversations.html b/src/addons/messages/pages/group-conversations/group-conversations.html index bfd14752d..5d6e5b57b 100644 --- a/src/addons/messages/pages/group-conversations/group-conversations.html +++ b/src/addons/messages/pages/group-conversations/group-conversations.html @@ -151,7 +151,7 @@ + onError="this.src='assets/img/group-avatar.svg'"> diff --git a/src/assets/img/grades/agg_mean.png b/src/assets/img/grades/agg_mean.png deleted file mode 100644 index 78c8046dfe8fa156481cf5a070e7d5e5ca2a93b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 341 zcmV-b0jmCqP)ZJ#p+^L_rUG(O3;)72rT;{I|pm#r01B z$#fMxTKrPl%HrNZ$BKAXnL^24DLPMm(3>#>aPI7L{=_!*L(cyKGD(nj`r%-PmY5m{way%t545g_5-Nd+lb8=OxtU>+Y$Yh5A}ux6I~z@vKOhCz% diff --git a/src/assets/img/grades/agg_sum.png b/src/assets/img/grades/agg_sum.png deleted file mode 100644 index 7bcc0e43aadddb5c7b3d776b73379bdfca45aa66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 318 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5X9(cMqhE&{2N^xK^PCr+|5cFHJgPH%*<;$WoB~GxjJFx6x z6mR&!JWI(@p{(T*r$-UHBa8B`jSl%H3@fWt6kQht%PX7|XINP`!@^A8$Dx>YQzDOp zukeC@^$k~9kL+NQe8AXum+snFooliNQbYnhE}7*nm$&~0EShO46AMm+CEvB^^CcY;Y7g>@d+l<4p*B@ z diff --git a/src/assets/img/group-avatar.png b/src/assets/img/group-avatar.png deleted file mode 100644 index 2e336c95ca87f61a6fa1309231e138b520c8a771..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 972 zcmV;-12g=IP)+J08?(XjO z_4V`f^X28`-QC^l>gws~>Ez_(i_vXf0000LbW%=J0RR90|NsC0|NsC0|NsC0|NsC0 z|4^{{F8}}l32;bRa{vH2T>t<%T>(QO5DEYQ0|iM$K~#90?U~zxs~`+TM*&4ts-5}& zZ#~{>B^L;tp3V#Vtu?STge2%!^#OeqNP!ecffPuA{8vb=v@u%M={b^?9HeQ@p|*)5 z1eOe>w&s+LK8(bYhIA%S$1_BhB*fWpsC67eW=TSN1JrX6nI#F)aH!@WGD`~5z>&r< zaU-;(ARQjcEWOY&6VeQWQp3=sEnkH=buNJ(-7g^y4_&7mf^fA1Zz+LPEgab{^LhB^ z&C!-ZNDYThl|$1l6FSOL3aP+dd*YUl+s2k+hzmBEcGXBRj2W?|91?hE@d~l&b~Vs4 z2U5BIh$Y)Q628=n`S6opG8S>wB1?s6V9dM`z8 zzpz<7mtr|Bx?>PEU-XC_#;5dhBTtzf9rU7Y|D$%|OABXR^n zZ)Q&Hi7yU`G(wq=5`jc|6iVcwAq9!FjkJi?F$u}^7HTF%5ZqEEgnBvwBrCR7@$tn% zB6Xb;yX#p9(S)SLzD!~vS=)UVyHi*Q+o14b-zEJmggNiN7ZPc*IkD;fZy}LRp3|5O z`N+b5WS@K_t>iBXY)&PRIdUAOWM3&-xhXR8u07TgH5nyE$G%O(Kho5~W}=OMWl4Pr udbGGvMSD~M diff --git a/src/core/features/grades/services/grades-helper.ts b/src/core/features/grades/services/grades-helper.ts index 91af997c6..b4d26bfa2 100644 --- a/src/core/features/grades/services/grades-helper.ts +++ b/src/core/features/grades/services/grades-helper.ts @@ -543,11 +543,11 @@ export class CoreGradesHelperProvider { text = text.replace('%2F', '/').replace('%2f', '/'); if (text.indexOf('/agg_mean') > -1) { row.itemtype = 'agg_mean'; - row.image = 'assets/img/grades/agg_mean.png'; + row.image = 'assets/img/grades/agg_mean.svg'; row.iconAlt = Translate.instant('core.grades.aggregatemean'); } else if (text.indexOf('/agg_sum') > -1) { row.itemtype = 'agg_sum'; - row.image = 'assets/img/grades/agg_sum.png'; + row.image = 'assets/img/grades/agg_sum.svg'; row.iconAlt = Translate.instant('core.grades.aggregatesum'); } else if (text.indexOf('/outcomes') > -1 || text.indexOf('fa-tasks') > -1) { row.itemtype = 'outcome'; @@ -555,7 +555,7 @@ export class CoreGradesHelperProvider { row.iconAlt = Translate.instant('core.grades.outcome'); } else if (text.indexOf('i/folder') > -1 || text.indexOf('fa-folder') > -1) { row.itemtype = 'category'; - row.icon = 'fas-cubes'; + row.icon = 'fas-folder'; row.iconAlt = Translate.instant('core.grades.category'); } else if (text.indexOf('/manual_item') > -1 || text.indexOf('fa-square-o') > -1) { row.itemtype = 'manual';