- + {{ relatedcomp.shortname }} - {{ relatedcomp.idnumber }}
diff --git a/src/addons/mod/assign/components/index/addon-mod-assign-index.html b/src/addons/mod/assign/components/index/addon-mod-assign-index.html index de43a804a..da491f51d 100644 --- a/src/addons/mod/assign/components/index/addon-mod-assign-index.html +++ b/src/addons/mod/assign/components/index/addon-mod-assign-index.html @@ -31,7 +31,7 @@{{ 'addon.mod_assign.numberofsubmissionsneedgrading' | translate }}
diff --git a/src/addons/mod/feedback/pages/form/form.html b/src/addons/mod/feedback/pages/form/form.html index 2bd0091ab..63acf1936 100644 --- a/src/addons/mod/feedback/pages/form/form.html +++ b/src/addons/mod/feedback/pages/form/form.html @@ -21,9 +21,7 @@
Couldn't find the directive to render this access rule.
-
- {{ 'core.iframehelp' | translate }}
-
-
+
diff --git a/src/core/components/navigation-bar/core-navigation-bar.html b/src/core/components/navigation-bar/core-navigation-bar.html
index 4e5528ec7..b04994a15 100644
--- a/src/core/components/navigation-bar/core-navigation-bar.html
+++ b/src/core/components/navigation-bar/core-navigation-bar.html
@@ -1,7 +1,7 @@
-
-
+ */
+@Component({
+ selector: 'core-spacer',
+ template: '![]()
+ [attr.tabindex]="linkProfile ? 0 : null"
+ [class.clickable]="linkProfile"
+>
+ * The value of the input will decide if show keyboard when focusing the element (only on Android).
+ * In case value is nofocus, the directive is disabled.
*
- * @deprecated since 3.9.5. ion-input now supports an [autofocus] attribute, please use that one instead.
+ *
*/
@Directive({
selector: '[core-auto-focus]',
})
-export class CoreAutoFocusDirective implements OnInit {
+export class CoreAutoFocusDirective implements AfterViewInit {
- @Input('core-auto-focus') coreAutoFocus: boolean | string = true;
+ @Input('core-auto-focus') showKeyboard: boolean | string = true;
protected element: HTMLElement;
@@ -38,31 +39,54 @@ export class CoreAutoFocusDirective implements OnInit {
}
/**
- * Component being initialized.
+ * @inheritdoc
*/
- ngOnInit(): void {
- this.autoFocus();
+ ngAfterViewInit(): void {
+ if (this.showKeyboard === 'nofocus') {
+ return;
+ }
+
+ this.setFocus();
}
/**
- * Function after the view is initialized.
+ * Function to focus the element.
+ *
+ * @param retries Internal param to stop retrying then 0.
*/
- protected autoFocus(): void {
- const autoFocus = CoreUtils.isTrueOrOne(this.coreAutoFocus);
- if (autoFocus) {
- // Wait a bit to make sure the view is loaded.
- setTimeout(() => {
- // If it's a ion-input or ion-textarea, search the right input to use.
- let element = this.element;
- if (this.element.tagName == 'ION-INPUT') {
- element = this.element.querySelector('input') || element;
- } else if (this.element.tagName == 'ION-TEXTAREA') {
- element = this.element.querySelector('textarea') || element;
- }
-
- CoreDomUtils.focusElement(element);
- }, 200);
+ protected setFocus(retries = 10): void {
+ if (retries == 0) {
+ return;
}
+
+ // Wait a bit to make sure the view is loaded.
+ setTimeout(() => {
+ // If it's a ion-input or ion-textarea, search the right input to use.
+ let element: HTMLElement | null = null;
+
+ if (this.element.tagName == 'ION-INPUT') {
+ element = this.element.querySelector('input');
+ } else if (this.element.tagName == 'ION-TEXTAREA') {
+ element = this.element.querySelector('textarea');
+ } else {
+ element = this.element;
+ }
+
+ if (!element) {
+ this.setFocus(retries - 1);
+
+ return;
+ }
+
+ const showKeyboard = this.showKeyboard === '' || CoreUtils.isTrueOrOne(this.showKeyboard);
+ CoreDomUtils.focusElement(element, showKeyboard);
+
+ if (element != document.activeElement) {
+ this.setFocus(retries - 1);
+
+ return;
+ }
+ }, 200);
}
}
diff --git a/src/core/features/course/classes/main-resource-component.ts b/src/core/features/course/classes/main-resource-component.ts
index 4aa56ece4..ad336718e 100644
--- a/src/core/features/course/classes/main-resource-component.ts
+++ b/src/core/features/course/classes/main-resource-component.ts
@@ -57,7 +57,7 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
loaded = false; // If the component has been loaded.
component?: string; // Component name.
componentId?: number; // Component ID.
- blog?: boolean; // If blog is avalaible.
+ blog?: boolean; // If blog is available.
// Data for context menu.
externalUrl?: string; // External URL to open in browser.
diff --git a/src/core/features/course/components/format/core-course-format.html b/src/core/features/course/components/format/core-course-format.html
index fb53e6f8c..8f7e56516 100644
--- a/src/core/features/course/components/format/core-course-format.html
+++ b/src/core/features/course/components/format/core-course-format.html
@@ -92,7 +92,7 @@
-
+![]()
+
+
![]()
-
+
diff --git a/src/core/features/course/components/module-completion/module-completion.scss b/src/core/features/course/components/module-completion/module-completion.scss
index 664cb4eef..a0fd0020d 100644
--- a/src/core/features/course/components/module-completion/module-completion.scss
+++ b/src/core/features/course/components/module-completion/module-completion.scss
@@ -1,13 +1,20 @@
:host {
- button {
- display: block;
- background-color: transparent;
+ min-width: var(--a11y-min-target-size);
+ min-height: var(--a11y-min-target-size);
+ --size: 30px;
- img {
- padding: 5px;
- width: 30px;
- vertical-align: middle;
- max-width: none;
- }
+ img {
+ padding: 5px;
+ width: var(--size);
+ vertical-align: middle;
+ max-width: none;
+ margin: 7px;
+ }
+
+ ion-button {
+ --padding-top: 0;
+ --padding-start: 0;
+ --padding-end: 0;
+ --padding-bottom: 0;
}
}
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 a6a942e03..453f5098c 100644
--- a/src/core/features/course/components/module/core-course-module.html
+++ b/src/core/features/course/components/module/core-course-module.html
@@ -1,22 +1,57 @@
-
+
+
+
- ![]()
-
-
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/src/core/features/course/components/module/module.scss b/src/core/features/course/components/module/module.scss
index 5ded99475..017a6d617 100644
--- a/src/core/features/course/components/module/module.scss
+++ b/src/core/features/course/components/module/module.scss
@@ -1,45 +1,10 @@
:host {
- // @todo Review commented styles.
- background: white;
- display: block;
-
- .item.core-course-module-handler {
- align-items: flex-start;
- min-height: 52px;
- cursor: pointer;
-
-// &.item .item-inner {
-// @include safe-area-padding(null, 0px, null, null);
-// }
-// .label {
-// @include margin(0, 0, 0, null);
-// }
- .core-module-icon {
- align-items: flex-start;
- width: 24px;
- height: 24px;
- margin-top: 11px;
- }
-
-// &.item-ios:active,
-// &.item-ios.activated {
-// background-color: $list-ios-activated-background-color;
-// }
-// &.item-md:active,
-// &.item-md.activated {
-// background-color: $list-md-activated-background-color;
-// }
+ .item.core-module-main-item {
+ --min-height: 52px;
}
- .core-module-title {
- display: flex;
- flex-flow: row;
- align-items: flex-start;
-
- core-format-text {
- flex-grow: 2;
- }
+ .core-module-main-item {
.core-module-buttons,
.buttons.core-module-buttons {
margin: 0;
@@ -66,10 +31,10 @@
}
}
- .core-module-more-info {
- // ion-badge {
- // @include text-align('start');
- // }
+ .core-module-module-description {
+ ion-badge {
+ text-align: start;
+ }
.core-module-availabilityinfo {
font-size: 90%;
@@ -79,86 +44,23 @@
}
}
- .core-not-clickable {
- cursor: initial;
-
-// &:active,
-// &.activated {
-// background-color: $list-background-color;
-// }
- }
-
.core-module-loading {
width: 100%;
text-align: center;
padding-top: 10px;
clear: both;
-// @include darkmode() {
-// color: $core-dark-text-color;
-// }
}
-// @include darkmode() {
-// .item.core-course-module-handler {
-// background: $core-dark-item-bg-color;
-// &.item-ios:active,
-// &.item-ios.activated,
-// &.item-md:active,
-// &.item-md.activated {
-// background-color: $core-dark-background-color;
-// }
-// }
+ .core-module-main-item + .core-module-module-description ion-label {
+ margin-top: 0px;
+ }
+
+ .core-module-main-item.has-module-description {
+ --inner-border-width: 0;
+ }
+
+ .core-module-module-description ion-label {
+ margin-inline-start: 50px;
+ }
-// .core-not-clickable:active,
-// .core-not-clickable.activated {
-// background-color: $core-dark-item-bg-color;
-// }
-// }
}
-
-// ion-app.app-root.md core-course-module {
-// .core-module-description {
-// @include padding(null, $label-md-margin-end, null, null);
-// margin-bottom: $label-md-margin-bottom;
-
-// .core-show-more {
-// @include padding(null, $label-md-margin-end, null, null);
-// }
-// }
-
-// .core-module-title core-format-text {
-// padding-top: $label-md-margin-top + 3;
-// }
-// .button-md {
-// margin-top: 8px;
-// margin-bottom: 8px;
-// }
-// .core-module-buttons-more {
-// min-height: 52px;
-// min-width: 53px;
-// }
-// }
-
-// ion-app.app-root.ios core-course-module {
-// .core-module-description {
-// @include padding(null, $label-ios-margin-end, null, null);
-// margin-bottom: $label-md-margin-bottom;
-
-// .core-show-more {
-// @include padding(null, $label-ios-margin-end, null, null);
-// }
-// }
-
-// .core-module-title core-format-text {
-// padding-top: $label-ios-margin-top + 3;
-// }
-
-// .core-module-buttons-more {
-// min-height: 53px;
-// min-width: 58px;
-// }
-// }
-
-// ion-app.app-root .core-course-module-handler.item [item-start] + .item-inner {
-// @include margin-horizontal(4px, null);
-// }
diff --git a/src/core/features/course/components/module/module.ts b/src/core/features/course/components/module/module.ts
index 0241aa2a5..abe5646e4 100644
--- a/src/core/features/course/components/module/module.ts
+++ b/src/core/features/course/components/module/module.ts
@@ -44,14 +44,14 @@ import {
})
export class CoreCourseModuleComponent implements OnInit, OnDestroy {
- @Input() module?: CoreCourseModule; // The module to render.
+ @Input() module!: CoreCourseModule; // The module to render.
@Input() courseId?: number; // The course the module belongs to.
@Input() section?: CoreCourseSection; // The section the module belongs to.
// eslint-disable-next-line @angular-eslint/no-input-rename
@Input('downloadEnabled') set enabled(value: boolean) {
this.downloadEnabled = value;
- if (!this.module?.handlerData?.showDownloadButton || !this.downloadEnabled || this.statusCalculated) {
+ if (!this.module.handlerData?.showDownloadButton || !this.downloadEnabled || this.statusCalculated) {
return;
}
@@ -81,10 +81,6 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
* Component being initialized.
*/
ngOnInit(): void {
- if (!this.module) {
- return;
- }
-
this.courseId = this.courseId || this.module.course;
this.modNameTranslated = CoreCourse.translateModuleName(this.module.modname) || '';
@@ -125,7 +121,7 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
* @param event Click event.
*/
moduleClicked(event: Event): void {
- if (this.module?.uservisible !== false && this.module?.handlerData?.action) {
+ if (this.module.uservisible !== false && this.module.handlerData?.action) {
this.module.handlerData.action(event, this.module, this.courseId!);
}
}
@@ -195,7 +191,7 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
this.spinner = false;
this.downloadStatus = status;
- this.module?.handlerData?.updateStatus?.(status);
+ this.module.handlerData?.updateStatus?.(status);
}
/**
@@ -218,7 +214,7 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
*/
ngOnDestroy(): void {
// this.statusObserver?.off();
- this.module?.handlerData?.onDestroy?.();
+ this.module.handlerData?.onDestroy?.();
this.isDestroyed = true;
}
diff --git a/src/core/features/course/pages/preview/preview.html b/src/core/features/course/pages/preview/preview.html
index 166ee40f1..02223dce5 100644
--- a/src/core/features/course/pages/preview/preview.html
+++ b/src/core/features/course/pages/preview/preview.html
@@ -58,7 +58,7 @@
diff --git a/src/core/features/courses/components/self-enrol-password/self-enrol-password.html b/src/core/features/courses/components/self-enrol-password/self-enrol-password.html
index 5de62417d..b1c6c8b3b 100644
--- a/src/core/features/courses/components/self-enrol-password/self-enrol-password.html
+++ b/src/core/features/courses/components/self-enrol-password/self-enrol-password.html
@@ -20,7 +20,7 @@
type="password"
placeholder="{{ 'core.courses.password' | translate }}"
[(ngModel)]="password"
- [autofocus]="true"
+ core-auto-focus
[clearOnEdit]="false">
diff --git a/src/core/features/courses/pages/categories/categories.html b/src/core/features/courses/pages/categories/categories.html
index 190552887..e1216beb6 100644
--- a/src/core/features/courses/pages/categories/categories.html
+++ b/src/core/features/courses/pages/categories/categories.html
@@ -39,9 +39,8 @@
-
+
diff --git a/src/core/features/courses/pages/categories/categories.ts b/src/core/features/courses/pages/categories/categories.ts
index f38243bbe..1714f4ebb 100644
--- a/src/core/features/courses/pages/categories/categories.ts
+++ b/src/core/features/courses/pages/categories/categories.ts
@@ -117,4 +117,13 @@ export class CoreCoursesCategoriesPage implements OnInit {
});
}
+ /**
+ * Open a category.
+ *
+ * @param categoryId Category Id.
+ */
+ openCategory(categoryId: number): void {
+ CoreNavigator.navigateToSitePath('courses/categories/' + categoryId);
+ }
+
}
diff --git a/src/core/features/courses/pages/my-courses/my-courses.ts b/src/core/features/courses/pages/my-courses/my-courses.ts
index e23121503..eb5f2d0b8 100644
--- a/src/core/features/courses/pages/my-courses/my-courses.ts
+++ b/src/core/features/courses/pages/my-courses/my-courses.ts
@@ -163,7 +163,7 @@ export class CoreCoursesMyCoursesPage implements OnInit, OnDestroy {
if (!newValue || !this.courses) {
this.filteredCourses = this.courses;
} else {
- // Use displayname if avalaible, or fullname if not.
+ // Use displayname if available, or fullname if not.
if (this.courses.length > 0 && typeof this.courses[0].displayname != 'undefined') {
this.filteredCourses = this.courses.filter((course) => course.displayname!.toLowerCase().indexOf(newValue) > -1);
} else {
diff --git a/src/core/features/courses/services/courses.ts b/src/core/features/courses/services/courses.ts
index 0e4d56c9b..acf54ef00 100644
--- a/src/core/features/courses/services/courses.ts
+++ b/src/core/features/courses/services/courses.ts
@@ -526,7 +526,7 @@ export class CoreCoursesProvider {
response.courses = response.courses.filter((course) => courseIds.indexOf(course.id) >= 0);
}
- // Courses will be sorted using sortorder if avalaible.
+ // Courses will be sorted using sortorder if available.
return response.courses.sort((a, b) => {
if (typeof a.sortorder == 'undefined' && typeof b.sortorder == 'undefined') {
return b.id - a.id;
diff --git a/src/core/features/editor/components/rich-text-editor/core-editor-rich-text-editor.html b/src/core/features/editor/components/rich-text-editor/core-editor-rich-text-editor.html
index ef4b82745..15e0859a2 100644
--- a/src/core/features/editor/components/rich-text-editor/core-editor-rich-text-editor.html
+++ b/src/core/features/editor/components/rich-text-editor/core-editor-rich-text-editor.html
@@ -16,98 +16,120 @@
diff --git a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
index 3605d5c53..b1990106d 100644
--- a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
+++ b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
@@ -511,6 +511,10 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
* @param event The event.
*/
async toggleEditor(event: Event): Promise
@@ -63,11 +62,16 @@
-
-
- {{ 'core.login.forgotten' | translate }}
-
-
+
+ {{ 'core.login.forgotten' | translate }}
+
@@ -87,8 +91,7 @@
-
+
{{ 'core.login.startsignup' | translate }}
diff --git a/src/core/features/login/pages/credentials/credentials.ts b/src/core/features/login/pages/credentials/credentials.ts
index 61cdeb2d5..ebde590b7 100644
--- a/src/core/features/login/pages/credentials/credentials.ts
+++ b/src/core/features/login/pages/credentials/credentials.ts
@@ -287,6 +287,20 @@ export class CoreLoginCredentialsPage implements OnInit, OnDestroy {
}
}
+ /**
+ * Open email signup page.
+ */
+ openEmailSignup(): void {
+ CoreNavigator.navigate('/login/emailsignup', { params: { siteUrl: this.siteUrl } });
+ }
+
+ /**
+ * Open settings page.
+ */
+ openSettings(): void {
+ CoreNavigator.navigate('/settings');
+ }
+
/**
* View destroyed.
*/
diff --git a/src/core/features/login/pages/forgotten-password/forgotten-password.html b/src/core/features/login/pages/forgotten-password/forgotten-password.html
index 615048cae..b7ddc1d03 100644
--- a/src/core/features/login/pages/forgotten-password/forgotten-password.html
+++ b/src/core/features/login/pages/forgotten-password/forgotten-password.html
@@ -31,7 +31,7 @@
+ formControlName="value" autocapitalize="none" autocorrect="off" [core-auto-focus]="showKeyboard">
diff --git a/src/core/features/login/pages/forgotten-password/forgotten-password.ts b/src/core/features/login/pages/forgotten-password/forgotten-password.ts
index e6aa8a6b0..5e54a3ce6 100644
--- a/src/core/features/login/pages/forgotten-password/forgotten-password.ts
+++ b/src/core/features/login/pages/forgotten-password/forgotten-password.ts
@@ -35,7 +35,7 @@ export class CoreLoginForgottenPasswordPage implements OnInit {
myForm!: FormGroup;
siteUrl!: string;
- autoFocus!: boolean;
+ showKeyboard!: boolean;
constructor(
protected formBuilder: FormBuilder,
@@ -55,7 +55,7 @@ export class CoreLoginForgottenPasswordPage implements OnInit {
}
this.siteUrl = siteUrl;
- this.autoFocus = Platform.is('tablet');
+ this.showKeyboard = Platform.is('tablet');
this.myForm = this.formBuilder.group({
field: ['username', Validators.required],
value: [CoreNavigator.getRouteParam('username') || '', Validators.required],
diff --git a/src/core/features/login/pages/reconnect/reconnect.html b/src/core/features/login/pages/reconnect/reconnect.html
index 2fec459d3..10db38476 100644
--- a/src/core/features/login/pages/reconnect/reconnect.html
+++ b/src/core/features/login/pages/reconnect/reconnect.html
@@ -7,7 +7,7 @@
{{ 'core.login.reconnect' | translate }}
-
+
![]()
+ autocomplete="current-password" enterkeyhint="go" required="true" core-auto-focus>
@@ -71,13 +71,16 @@
-
-
-
- {{ 'core.login.forgotten' | translate }}
-
-
-
+
+ {{ 'core.login.forgotten' | translate }}
+
@@ -85,8 +88,8 @@
- ![]()
+ (click)="oauthClicked(provider)">
+ ![]()
{{provider.name}}
diff --git a/src/core/features/login/pages/reconnect/reconnect.ts b/src/core/features/login/pages/reconnect/reconnect.ts
index 8eeb846b1..21c3c4f9a 100644
--- a/src/core/features/login/pages/reconnect/reconnect.ts
+++ b/src/core/features/login/pages/reconnect/reconnect.ts
@@ -271,4 +271,27 @@ export class CoreLoginReconnectPage implements OnInit, OnDestroy {
}
}
+ /**
+ * A11y key functionality that prevents keyDown events.
+ *
+ * @param e Event.
+ */
+ keyDown(e: KeyboardEvent): void {
+ if (e.key == 'Escape') {
+ e.preventDefault();
+ e.stopPropagation();
+ }
+ }
+
+ /**
+ * Cancel reconnect.
+ *
+ * @param e Event.
+ */
+ keyUp(e: KeyboardEvent): void {
+ if (e.key == 'Escape') {
+ this.cancel(e);
+ }
+ }
+
}
diff --git a/src/core/features/login/pages/site/site.html b/src/core/features/login/pages/site/site.html
index abd234287..7b509ee74 100644
--- a/src/core/features/login/pages/site/site.html
+++ b/src/core/features/login/pages/site/site.html
@@ -7,8 +7,7 @@
{{ 'core.login.connecttomoodle' | translate }}
-
+
@@ -27,7 +26,7 @@
+ formControlName="siteUrl" [core-auto-focus]="showKeyboard">
@@ -37,7 +36,7 @@
+ [core-auto-focus]="showKeyboard" (ionChange)="searchSite($event, siteForm.value.siteUrl)">
@@ -109,12 +108,16 @@
-
-
- {{ 'core.needhelp' | translate }}
-
-
+
+ {{ 'core.needhelp' | translate }}
+
diff --git a/src/core/features/login/pages/site/site.scss b/src/core/features/login/pages/site/site.scss
index 31d2a2823..bcc7e8f43 100644
--- a/src/core/features/login/pages/site/site.scss
+++ b/src/core/features/login/pages/site/site.scss
@@ -12,7 +12,6 @@
.item {
&.core-login-need-help {
- text-decoration: underline;
margin-top: 16px;
}
&.core-login-site-qrcode {
diff --git a/src/core/features/login/pages/site/site.ts b/src/core/features/login/pages/site/site.ts
index 88ee2c599..b37642d19 100644
--- a/src/core/features/login/pages/site/site.ts
+++ b/src/core/features/login/pages/site/site.ts
@@ -567,6 +567,13 @@ export class CoreLoginSitePage implements OnInit {
CoreCustomURLSchemes.treatHandleCustomURLError(error);
}
+ /**
+ * Open settings page.
+ */
+ openSettings(): void {
+ CoreNavigator.navigate('/settings');
+ }
+
}
/**
diff --git a/src/core/features/login/pages/sites/sites.html b/src/core/features/login/pages/sites/sites.html
index 20789cbb7..e9c437993 100644
--- a/src/core/features/login/pages/sites/sites.html
+++ b/src/core/features/login/pages/sites/sites.html
@@ -11,8 +11,7 @@
[attr.aria-label]="'core.delete' | translate">
-
+
diff --git a/src/core/features/login/pages/sites/sites.ts b/src/core/features/login/pages/sites/sites.ts
index 7c5b778c5..34d4e873a 100644
--- a/src/core/features/login/pages/sites/sites.ts
+++ b/src/core/features/login/pages/sites/sites.ts
@@ -139,4 +139,11 @@ export class CoreLoginSitesPage implements OnInit {
this.showDelete = !this.showDelete;
}
+ /**
+ * Open settings page.
+ */
+ openSettings(): void {
+ CoreNavigator.navigate('/settings');
+ }
+
}
diff --git a/src/core/features/mainmenu/pages/menu/menu.scss b/src/core/features/mainmenu/pages/menu/menu.scss
index 151bea4ec..a7a70d8d4 100644
--- a/src/core/features/mainmenu/pages/menu/menu.scss
+++ b/src/core/features/mainmenu/pages/menu/menu.scss
@@ -1,9 +1,10 @@
+@import "~theme/globals";
+
:host{
--menutabbar-size: 60px;
- ion-tabs {
- -webkit-filter: drop-shadow(0px 3px 3px rgba(var(--drop-shadow)));
- filter: drop-shadow(0px 3px 3px rgba(var(--drop-shadow)));
+ ion-tab-bar {
+ box-shadow: 0px -3px 3px rgba(var(--drop-shadow));
}
ion-tab-button ion-icon {
@@ -28,6 +29,10 @@
width: var(--menutabbar-size);
height: 100%;
flex-direction: column;
+ @include border-end(var(--border));
+ box-shadow: 3px 0 3px rgba(var(--drop-shadow));
+ border-top: 0;
+
ion-tab-button {
width: 100%;
ion-badge {
diff --git a/src/core/features/mainmenu/pages/more/more.html b/src/core/features/mainmenu/pages/more/more.html
index 6f0fc716f..79b029c4e 100644
--- a/src/core/features/mainmenu/pages/more/more.html
+++ b/src/core/features/mainmenu/pages/more/more.html
@@ -20,7 +20,7 @@
@@ -82,7 +82,7 @@
diff --git a/src/core/features/search/components/search-box/core-search-box.html b/src/core/features/search/components/search-box/core-search-box.html
index 8cc8753b9..8438c6237 100644
--- a/src/core/features/search/components/search-box/core-search-box.html
+++ b/src/core/features/search/components/search-box/core-search-box.html
@@ -3,7 +3,7 @@
{{ siteUrl }}
-
-
-
+
@@ -63,7 +61,7 @@
-
+
-
+
-
+
-
+
diff --git a/src/core/features/sitehome/pages/index/index.ts b/src/core/features/sitehome/pages/index/index.ts
index 591da63fd..8976ef25e 100644
--- a/src/core/features/sitehome/pages/index/index.ts
+++ b/src/core/features/sitehome/pages/index/index.ts
@@ -221,6 +221,27 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
CoreNavigator.navigateToSitePath('courses/search');
}
+ /**
+ * Go to available courses.
+ */
+ openAvailableCourses(): void {
+ CoreNavigator.navigateToSitePath('courses/all');
+ }
+
+ /**
+ * Go to my courses.
+ */
+ openMyCourses(): void {
+ CoreNavigator.navigateToSitePath('courses/my');
+ }
+
+ /**
+ * Go to course categories.
+ */
+ openCourseCategories(): void {
+ CoreNavigator.navigateToSitePath('courses/categories');
+ }
+
/**
* Component being destroyed.
*/
diff --git a/src/core/features/user/pages/profile/profile.html b/src/core/features/user/pages/profile/profile.html
index c25b6295d..ca5949996 100644
--- a/src/core/features/user/pages/profile/profile.html
+++ b/src/core/features/user/pages/profile/profile.html
@@ -14,11 +14,16 @@
-
+
+
+
+ * The value of the input will decide if show keyboard when focusing the element (only on Android).
+ * In case value is nofocus, the directive is disabled.
*
- * @deprecated since 3.9.5. ion-input now supports an [autofocus] attribute, please use that one instead.
+ *
-
-
+ ![]()
+
+
+
+
+
+
+
+ {{ 'core.course.hiddenfromstudents' | translate }}
+
+
+ {{ 'core.course.hiddenoncoursepage' | translate }}
+
+
+
+ {{ 'core.course.manualcompletionnotsynced' | translate }}
+
+
-
-
-
-
+
+
+
+
-
-
-
-
- {{ 'core.course.hiddenfromstudents' | translate }}
-
-
- {{ 'core.course.hiddenoncoursepage' | translate }}
-
-
-
- {{ 'core.course.manualcompletionnotsynced' | translate }}
-
-
+ {{contact.fullname}}
-
diff --git a/src/core/features/courses/pages/categories/categories.ts b/src/core/features/courses/pages/categories/categories.ts
index f38243bbe..1714f4ebb 100644
--- a/src/core/features/courses/pages/categories/categories.ts
+++ b/src/core/features/courses/pages/categories/categories.ts
@@ -117,4 +117,13 @@ export class CoreCoursesCategoriesPage implements OnInit {
});
}
+ /**
+ * Open a category.
+ *
+ * @param categoryId Category Id.
+ */
+ openCategory(categoryId: number): void {
+ CoreNavigator.navigateToSitePath('courses/categories/' + categoryId);
+ }
+
}
diff --git a/src/core/features/courses/pages/my-courses/my-courses.ts b/src/core/features/courses/pages/my-courses/my-courses.ts
index e23121503..eb5f2d0b8 100644
--- a/src/core/features/courses/pages/my-courses/my-courses.ts
+++ b/src/core/features/courses/pages/my-courses/my-courses.ts
@@ -163,7 +163,7 @@ export class CoreCoursesMyCoursesPage implements OnInit, OnDestroy {
if (!newValue || !this.courses) {
this.filteredCourses = this.courses;
} else {
- // Use displayname if avalaible, or fullname if not.
+ // Use displayname if available, or fullname if not.
if (this.courses.length > 0 && typeof this.courses[0].displayname != 'undefined') {
this.filteredCourses = this.courses.filter((course) => course.displayname!.toLowerCase().indexOf(newValue) > -1);
} else {
diff --git a/src/core/features/courses/services/courses.ts b/src/core/features/courses/services/courses.ts
index 0e4d56c9b..acf54ef00 100644
--- a/src/core/features/courses/services/courses.ts
+++ b/src/core/features/courses/services/courses.ts
@@ -526,7 +526,7 @@ export class CoreCoursesProvider {
response.courses = response.courses.filter((course) => courseIds.indexOf(course.id) >= 0);
}
- // Courses will be sorted using sortorder if avalaible.
+ // Courses will be sorted using sortorder if available.
return response.courses.sort((a, b) => {
if (typeof a.sortorder == 'undefined' && typeof b.sortorder == 'undefined') {
return b.id - a.id;
diff --git a/src/core/features/editor/components/rich-text-editor/core-editor-rich-text-editor.html b/src/core/features/editor/components/rich-text-editor/core-editor-rich-text-editor.html
index ef4b82745..15e0859a2 100644
--- a/src/core/features/editor/components/rich-text-editor/core-editor-rich-text-editor.html
+++ b/src/core/features/editor/components/rich-text-editor/core-editor-rich-text-editor.html
@@ -16,98 +16,120 @@
diff --git a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
index 3605d5c53..b1990106d 100644
--- a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
+++ b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
@@ -511,6 +511,10 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
* @param event The event.
*/
async toggleEditor(event: Event): Promise {
+ if (event.type == 'keyup' && !this.isValidKeyboardKey(event)) {
+ return;
+ }
+
this.stopBubble(event);
this.setContent(this.control?.value || '');
@@ -654,6 +658,10 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
* toolbar styles button when set.
*/
buttonAction(event: Event, command: string, parameters?: string): void {
+ if (event.type == 'keyup' && !this.isValidKeyboardKey(event)) {
+ return;
+ }
+
this.stopBubble(event);
if (!command) {
@@ -725,6 +733,10 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
* Hide the toolbar in phone mode.
*/
hideToolbar(event: Event): void {
+ if (event.type == 'keyup' && !this.isValidKeyboardKey(event)) {
+ return;
+ }
+
this.element.classList.remove('has-focus');
this.stopBubble(event);
@@ -734,6 +746,16 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
}
}
+ /**
+ * Checks if Space or Enter have been pressed.
+ *
+ * @param event Keyboard Event.
+ * @returns Wether space or enter have been pressed.
+ */
+ protected isValidKeyboardKey(event: KeyboardEvent): boolean {
+ return event.key == ' ' || event.key == 'Enter';
+ }
+
/**
* Show the toolbar.
*/
@@ -754,7 +776,7 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
* @param event Event.
*/
stopBubble(event: Event): void {
- if (event.type != 'mouseup') {
+ if (event.type != 'mouseup' && event.type != 'keyup') {
event.preventDefault();
}
event.stopPropagation();
@@ -765,7 +787,11 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
*
* @param event Event.
*/
- mouseDownAction(event: Event): void {
+ downAction(event: Event): void {
+ if (event.type == 'keydown' && !this.isValidKeyboardKey(event)) {
+ return;
+ }
+
const selection = window.getSelection()?.toString();
// When RTE is focused with a whole paragraph in desktop the stopBubble will not fire click.
@@ -778,6 +804,10 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
* Method that shows the next toolbar buttons.
*/
async toolbarNext(event: Event): Promise {
+ if (event.type == 'keyup' && !this.isValidKeyboardKey(event)) {
+ return;
+ }
+
this.stopBubble(event);
if (!this.toolbarNextHidden) {
@@ -792,6 +822,10 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
* Method that shows the previous toolbar buttons.
*/
async toolbarPrev(event: Event): Promise {
+ if (event.type == 'keyup' && !this.isValidKeyboardKey(event)) {
+ return;
+ }
+
this.stopBubble(event);
if (!this.toolbarPrevHidden) {
diff --git a/src/core/features/grades/services/grades-helper.ts b/src/core/features/grades/services/grades-helper.ts
index baf9cfbe8..4f45ee75d 100644
--- a/src/core/features/grades/services/grades-helper.ts
+++ b/src/core/features/grades/services/grades-helper.ts
@@ -471,7 +471,7 @@ export class CoreGradesHelperProvider {
}
// Try to open the module grade directly. Check if it's possible.
- const grades = await CoreGrades.isGradeItemsAvalaible(siteId);
+ const grades = await CoreGrades.isGradeItemsAvailable(siteId);
if (!grades) {
throw new CoreError('No grades found.');
@@ -543,7 +543,7 @@ export class CoreGradesHelperProvider {
const site = await CoreSites.getSite(siteId);
userId = userId || site.getUserId();
- const enabled = await CoreGrades.isGradeItemsAvalaible(siteId);
+ const enabled = await CoreGrades.isGradeItemsAvailable(siteId);
return enabled
? CoreGrades.invalidateCourseGradesItemsData(courseId, userId, groupId, siteId)
diff --git a/src/core/features/grades/services/grades.ts b/src/core/features/grades/services/grades.ts
index 2e40eab8f..42551d176 100644
--- a/src/core/features/grades/services/grades.ts
+++ b/src/core/features/grades/services/grades.ts
@@ -87,7 +87,7 @@ export class CoreGradesProvider {
/**
* Get the grade items for a certain module. Keep in mind that may have more than one item to include outcomes and scales.
- * Fallback function only used if 'gradereport_user_get_grade_items' WS is not avalaible Moodle < 3.2.
+ * Fallback function only used if 'gradereport_user_get_grade_items' WS is not available Moodle < 3.2.
*
* @param courseId ID of the course to get the grades from.
* @param userId ID of the user to get the grades from. If not defined use site's current user.
@@ -109,7 +109,7 @@ export class CoreGradesProvider {
userId = userId || site.getUserId();
- const enabled = await this.isGradeItemsAvalaible(siteId);
+ const enabled = await this.isGradeItemsAvailable(siteId);
if (enabled) {
try {
@@ -340,13 +340,13 @@ export class CoreGradesProvider {
}
/**
- * Returns whether or not WS Grade Items is avalaible.
+ * Returns whether or not WS Grade Items is available.
*
* @param siteId Site ID. If not defined, current site.
- * @return True if ws is avalaible, false otherwise.
+ * @return True if ws is available, false otherwise.
* @since Moodle 3.2
*/
- async isGradeItemsAvalaible(siteId?: string): Promise {
+ async isGradeItemsAvailable(siteId?: string): Promise {
const site = await CoreSites.getSite(siteId);
return site.wsAvailable('gradereport_user_get_grade_items');
diff --git a/src/core/features/login/pages/credentials/credentials.html b/src/core/features/login/pages/credentials/credentials.html
index 7594c44cc..5d34e1eef 100644
--- a/src/core/features/login/pages/credentials/credentials.html
+++ b/src/core/features/login/pages/credentials/credentials.html
@@ -7,8 +7,7 @@
{{ 'core.login.login' | translate }}
-
+
@@ -34,7 +33,7 @@
+ required="true" core-auto-focus>
{{ 'core.login.potentialidps' | translate }}
{{ 'core.login.siteaddress' | translate }}
{{ 'core.login.siteaddress' | translate }}
{{ siteUrl }}
-