From d4515ca74cee5029be65a0a2e1fce224b9c1bb59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?=
Date: Thu, 24 Feb 2022 16:44:24 +0100
Subject: [PATCH] MOBILE-3149 module: Add collapsible footer buttons on module
index pages
---
.../components/index/index.html | 29 ++--
.../index/addon-mod-book-index.html | 21 +--
.../index/addon-mod-chat-index.html | 26 +--
.../index/addon-mod-choice-index.html | 25 +--
.../index/addon-mod-feedback-index.html | 47 +++---
.../index/addon-mod-imscp-index.html | 16 +-
.../index/addon-mod-lesson-index.html | 152 +++++++++---------
.../components/index/addon-mod-lti-index.html | 19 +--
.../index/addon-mod-resource-index.html | 22 +--
.../index/addon-mod-scorm-index.html | 90 +++++------
.../index/addon-mod-survey-index.html | 32 ++--
.../components/index/addon-mod-url-index.html | 23 ++-
.../index/addon-mod-workshop-index.html | 39 ++---
src/theme/theme.base.scss | 14 +-
src/theme/theme.light.scss | 4 +-
15 files changed, 288 insertions(+), 271 deletions(-)
diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.html b/src/addons/mod/bigbluebuttonbn/components/index/index.html
index f17bc8bf5..1463c7c65 100644
--- a/src/addons/mod/bigbluebuttonbn/components/index/index.html
+++ b/src/addons/mod/bigbluebuttonbn/components/index/index.html
@@ -94,15 +94,6 @@
-
- {{ 'addon.mod_bigbluebuttonbn.view_conference_action_join' | translate }}
-
-
-
- {{ 'addon.mod_bigbluebuttonbn.view_conference_action_end' | translate }}
-
-
@@ -110,8 +101,20 @@
-
-
-
+
+
+
+ {{ 'addon.mod_bigbluebuttonbn.view_conference_action_end' | translate }}
+
+
+ {{ 'addon.mod_bigbluebuttonbn.view_conference_action_join' | translate }}
+
+
+
+
+
+
+
diff --git a/src/addons/mod/book/components/index/addon-mod-book-index.html b/src/addons/mod/book/components/index/addon-mod-book-index.html
index cdd809546..5e95da64d 100644
--- a/src/addons/mod/book/components/index/addon-mod-book-index.html
+++ b/src/addons/mod/book/components/index/addon-mod-book-index.html
@@ -31,16 +31,17 @@
-
-
- {{ 'core.start' | translate }}
- {{ 'core.resume' | translate }}
-
-
-
+
+
+
+ {{ 'core.start' | translate }}
+ {{ 'core.resume' | translate }}
+
+
-
-
+
+
+
+
diff --git a/src/addons/mod/chat/components/index/addon-mod-chat-index.html b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
index 52c2a5cc4..764e01db2 100644
--- a/src/addons/mod/chat/components/index/addon-mod-chat-index.html
+++ b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
@@ -20,16 +20,18 @@
-
-
- {{ 'addon.mod_chat.enterchat' | translate }}
-
-
- {{ 'addon.mod_chat.viewreport' | translate }}
-
-
-
+
+ {{ 'addon.mod_chat.viewreport' | translate }}
+
-
-
+
+
+
+ {{ 'addon.mod_chat.enterchat' | translate }}
+
+
+
+
+
+
+
diff --git a/src/addons/mod/choice/components/index/addon-mod-choice-index.html b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
index f5620647c..be4e8eb0b 100644
--- a/src/addons/mod/choice/components/index/addon-mod-choice-index.html
+++ b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
@@ -64,12 +64,6 @@
-
- {{ 'addon.mod_choice.savemychoice' | translate }}
-
-
- {{ 'addon.mod_choice.removemychoice' | translate }}
-
@@ -139,11 +133,24 @@
+
+
+
+
+
+ {{ 'addon.mod_choice.removemychoice' | translate }}
+
+
+ {{ 'addon.mod_choice.savemychoice' | translate }}
+
+
+
+
+
+
-
-
+
diff --git a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
index 4ffa61d9a..00bc860e7 100644
--- a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
+++ b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
@@ -33,11 +33,28 @@
-
-
-
+
+
+
+
+ {{ 'addon.mod_feedback.preview' | translate }}
+
+
+
+ {{ 'addon.mod_feedback.complete_the_form' | translate }}
+
+
+ {{ 'addon.mod_feedback.continue_the_form' | translate }}
+
+
+
+
+
+
+
+
@@ -133,28 +150,6 @@
{{ 'addon.mod_feedback.non_anonymous' | translate }}
-
-
-
-
-
- {{ 'addon.mod_feedback.preview' | translate }}
-
-
-
-
-
- {{ 'addon.mod_feedback.complete_the_form' | translate }}
-
-
- {{ 'addon.mod_feedback.continue_the_form' | translate }}
-
-
-
-
-
-
-
diff --git a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
index 608162e22..e4cfff579 100644
--- a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
+++ b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
@@ -26,12 +26,12 @@
-
-
- 1 && false" [items]="navigationItems"
- (action)="loadItem($event)">
-
-
-
+
+
+ 1" [items]="navigationItems" (action)="loadItem($event)">
+
+
+
+
+
diff --git a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
index 188c0ca97..c2f13b4e5 100644
--- a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
+++ b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
@@ -38,84 +38,15 @@
{{ 'addon.mod_lesson.continue' | translate }}
-
-
+
-
-
-
-
- {{ 'addon.mod_lesson.retakefinishedinsync' | translate }}
-
-
-
- {{ 'addon.mod_lesson.review' | translate }}
-
-
-
-
-
-
-
-
-
-
-
-
- {{ 'core.no' | translate }}
-
-
-
-
- {{ 'core.yes' | translate }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ 'addon.mod_lesson.continue' | translate }}
-
-
-
-
-
-
-
-
-
-
-
-
- {{ 'core.start' | translate }}
-
-
-
- {{ 'addon.mod_lesson.preview' | translate }}
-
-
-
-
-
-
- {{ 'addon.mod_lesson.continue' | translate }}
-
-
-
+
@@ -277,8 +208,81 @@
+
+
-
-
+
+
+
+
+
+
+ {{ 'addon.mod_lesson.retakefinishedinsync' | translate }}
+
+
+
+ {{ 'addon.mod_lesson.review' | translate }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ 'core.no' | translate }}
+
+
+
+
+ {{ 'core.yes' | translate }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 'addon.mod_lesson.continue' | translate }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ 'core.start' | translate }}
+
+
+
+ {{ 'addon.mod_lesson.preview' | translate }}
+
+
+
+
+
+ {{ 'addon.mod_lesson.continue' | translate }}
+
+
+
diff --git a/src/addons/mod/lti/components/index/addon-mod-lti-index.html b/src/addons/mod/lti/components/index/addon-mod-lti-index.html
index 217ee88b2..a85613113 100644
--- a/src/addons/mod/lti/components/index/addon-mod-lti-index.html
+++ b/src/addons/mod/lti/components/index/addon-mod-lti-index.html
@@ -13,14 +13,15 @@
[componentId]="componentId" [courseId]="courseId">
-
-
-
- {{ 'addon.mod_lti.launchactivity' | translate }}
-
+
+
+
+ {{ 'addon.mod_lti.launchactivity' | translate }}
+
+
+
+
+
+
-
-
-
diff --git a/src/addons/mod/resource/components/index/addon-mod-resource-index.html b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
index 0fd7713b7..cf24bdd04 100644
--- a/src/addons/mod/resource/components/index/addon-mod-resource-index.html
+++ b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
@@ -6,7 +6,7 @@
-
+
+
+
-
+
+
+
{{ 'core.play' | translate }}
@@ -88,15 +92,13 @@
-
+
{{ 'core.openwith' | translate }}
-
-
+
+
+
+
-
-
-
diff --git a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
index f3dc13496..0c2f0ea6c 100644
--- a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
+++ b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
@@ -21,7 +21,7 @@
-
+
@@ -155,32 +155,34 @@
+
-
-
-
-
- {{ errorMessage | translate }}
-
-
-
- {{ 'core.openinbrowser' | translate }}
-
-
-
+
+
+
+
+
+
+ {{ errorMessage | translate }}
+
+
+
+ {{ 'core.openinbrowser' | translate }}
+
+
+
-
-
-
-
- {{ 'addon.mod_scorm.exceededmaxattempts' | translate }}
-
-
-
+
+
+
+
+ {{ 'addon.mod_scorm.exceededmaxattempts' | translate }}
+
+
+
-
-
0)">
-
+ 0)">
+
0 && !incomplete && attemptsLeft > 0">
@@ -189,29 +191,21 @@
-
-
+
+
{{ statusMessage | translate }}
-
-
-
-
- {{ 'addon.mod_scorm.browse' | translate }}
-
-
-
-
-
- {{ 'addon.mod_scorm.enter' | translate }}
-
-
-
-
-
+
+
+ {{ 'addon.mod_scorm.browse' | translate }}
+
+
+ {{ 'addon.mod_scorm.enter' | translate }}
+
@@ -223,11 +217,9 @@
-
-
-
+
+
+
+
+
-
-
-
diff --git a/src/addons/mod/survey/components/index/addon-mod-survey-index.html b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
index 6fd4d8906..431d04f34 100644
--- a/src/addons/mod/survey/components/index/addon-mod-survey-index.html
+++ b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
@@ -21,10 +21,6 @@
{{ 'addon.mod_survey.surveycompletednograph' | translate }}
-
-
- {{ 'addon.mod_survey.results' | translate }}
-
@@ -119,18 +115,22 @@
-
-
-
-
- {{ 'core.submit' | translate }}
-
-
-
-
+
+
+
+ {{ 'addon.mod_survey.results' | translate }}
+
+
-
-
+
+ {{ 'core.submit' | translate }}
+
+
+
+
+
+
+
diff --git a/src/addons/mod/url/components/index/addon-mod-url-index.html b/src/addons/mod/url/components/index/addon-mod-url-index.html
index 9bd9966eb..734fbbe7e 100644
--- a/src/addons/mod/url/components/index/addon-mod-url-index.html
+++ b/src/addons/mod/url/components/index/addon-mod-url-index.html
@@ -35,17 +35,16 @@
{{ url }}
-
-
-
-
- {{ 'addon.mod_url.accessurl' | translate }}
-
-
-
-
-
-
+
+
+
+
+ {{ 'addon.mod_url.accessurl' | translate }}
+
+
+
+
+
+
diff --git a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
index adc5c72e4..7ce927fb2 100644
--- a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
+++ b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
@@ -117,20 +117,6 @@
-
-
-
-
-
-
- {{ 'addon.mod_workshop.createsubmission' | translate }}
-
-
-
- {{ 'addon.mod_workshop.editsubmission' | translate }}
-
-
-
@@ -231,8 +217,25 @@
-
-
-
+
+
+
= PHASE_SUBMISSION && canSubmit && showSubmit &&
+ ((access.creatingsubmissionallowed && !submission) || (access.modifyingsubmissionallowed && submission))">
+
+
+
+ {{ 'addon.mod_workshop.createsubmission' | translate }}
+
+
+
+ {{ 'addon.mod_workshop.editsubmission' | translate }}
+
+
+
+
+
+
+
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 8261707ae..f3d4ef15b 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -140,7 +140,7 @@ body {
@each $color-name, $unused in $colors {
.text-#{$color-name},
p.text-#{$color-name} {
- color: var(--ion-color-#{$color-name});
+ color: var(--ion-color-#{$color-name}) !important;
}
}
@@ -831,8 +831,8 @@ ion-list.core-course-module-list-wrapper,
.list-item-limited-width,
.core-course-module-list-wrapper {
max-width: var(--list-item--max-width);
- margin-left: auto;
- margin-right: auto;
+ margin-left: auto !important;
+ margin-right: auto !important;
}
ion-toolbar h1 img.core-bar-button-image,
@@ -1451,13 +1451,19 @@ ion-grid.core-no-grid > ion-row {
--core-collapsible-footer-height: auto;
}
+ .ion-margin {
+ margin-top: 8px;
+ margin-bottom: 8px;
+ }
+
+ filter: var(--scroll-shadow-top, none);
+ -webkit-filter: var(--scroll-shadow-top, none);
width: 100%;
bottom: 0;
z-index: 3;
height: var(--core-collapsible-footer-height, auto);
background-color: var(--core-collapsible-footer-background);
display: block;
- border-top: 1px solid var(--stroke);
@include core-transition(all, 200ms);
}
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 34fa46c45..febfd5762 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -334,7 +334,9 @@
--addon-forum-border-color: var(--stroke);
--addon-forum-highlight-color: var(--light);
- --drop-shadow: 0, 0, 0, 0.18;
+ --drop-shadow: 0, 0, 0, 0.5;
+ --scroll-shadow-bottom: drop-shadow(0px 3px 3px rgba(var(--drop-shadow)));
+ --scroll-shadow-top: drop-shadow(0px 3px 3px rgba(var(--drop-shadow)));
--core-question-correct-color: var(--success-shade);
--core-question-correct-color-bg: var(--success-tint);