Merge pull request #2919 from moodlehq/rc

Rc

src/core/components/combobox/combobox.scss

@@ -99,6 +99,7 @@ ion-button {
         font-weight: 400;
         font-size: 16px;
         line-height: 20px;
+        border-radius: 0;
     }
 
     .select-text {

src/core/components/infinite-loading/infinite-loading.ts

@@ -69,7 +69,7 @@ export class CoreInfiniteLoadingComponent implements OnChanges {
      * like the Ionic component does.
      */
     protected async checkScrollDistance(): Promise<void> {
-        if (!this.enabled) {
+        if (!this.enabled || this.error || this.loadingMore) {
             return;
         }
 

src/core/features/login/pages/site/site.ts

@@ -20,7 +20,7 @@ import { CoreConfig } from '@services/config';
 import { CoreSites, CoreSiteCheckResponse, CoreLoginSiteInfo, CoreSitesDemoSiteData } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreLoginHelper, CoreLoginHelperProvider } from '@features/login/services/login-helper';
+import { CoreLoginHelper, CoreLoginHelperProvider, CoreLoginSiteSelectorListMethod } from '@features/login/services/login-helper';
 import { CoreSite } from '@classes/site';
 import { CoreError } from '@classes/errors/error';
 import { CoreConstants } from '@/core/constants';
@@ -49,7 +49,7 @@ export class CoreLoginSitePage implements OnInit {
     siteForm: FormGroup;
     fixedSites?: CoreLoginSiteInfoExtended[];
     filteredSites?: CoreLoginSiteInfoExtended[];
-    siteSelector = 'sitefinder';
+    siteSelector: CoreLoginSiteSelectorListMethod = 'sitefinder';
     showKeyboard = false;
     filter = '';
     sites: CoreLoginSiteInfoExtended[] = [];
@@ -124,24 +124,14 @@ export class CoreLoginSitePage implements OnInit {
      * @return URL of the first site.
      */
     protected initSiteSelector(): string {
-        // Deprecate listnourl on 3.9.3, remove this block on the following release.
-        if (this.siteSelector == 'listnourl') {
-            this.siteSelector = 'list';
-            this.siteFinderSettings.displayurl = false;
-        }
-
         this.fixedSites = this.extendCoreLoginSiteInfo(<CoreLoginSiteInfoExtended[]> CoreLoginHelper.getFixedSites());
+        this.siteSelector = 'list'; // In case it's not defined
 
         // Do not show images if none are set.
         if (!this.fixedSites.some((site) => !!site.imageurl)) {
             this.siteFinderSettings.displayimage = false;
         }
 
-        // Autoselect if not defined.
-        if (this.siteSelector != 'list' && this.siteSelector != 'buttons') {
-            this.siteSelector = this.fixedSites.length > 3 ? 'list' : 'buttons';
-        }
-
         this.filteredSites = this.fixedSites;
 
         return this.fixedSites[0].url;

src/core/features/login/services/login-helper.ts

@@ -1443,3 +1443,9 @@ type StoredLoginLaunchData = {
     pageOptions: CoreNavigationOptions;
     ssoUrlParams: CoreUrlParams;
 };
+
+export type CoreLoginSiteSelectorListMethod =
+    'url'|
+    'sitefinder'|
+    'list'|
+    '';

src/core/features/sitehome/pages/index/index.html

@@ -21,8 +21,8 @@
                     <!-- Site home main contents. -->
                     <ng-container *ngIf="section && section.hasContent">
                         <ion-item class="ion-text-wrap" *ngIf="section.summary">
-                            <core-format-text [text]="section.summary" contextLevel="course" [contextInstanceId]="siteHomeId">
+                            <ion-label><core-format-text [text]="section.summary" contextLevel="course" [contextInstanceId]="siteHomeId">
-                            </core-format-text>
+                            </core-format-text></ion-label>
                         </ion-item>
 
                         <core-course-module *ngFor="let module of section.modules" [module]="module" [courseId]="siteHomeId"

src/core/features/sitehome/services/sitehome.ts

@@ -27,7 +27,7 @@ import { AddonModForum, AddonModForumData } from '@addons/mod/forum/services/for
 export enum FrontPageItemNames {
     NEWS_ITEMS = 0,
     LIST_OF_CATEGORIES = 2,
-    COMBO_LIST = 3,
+    COMBO_LIST = 4,
     ENROLLED_COURSES = 5,
     LIST_OF_COURSE = 6,
     COURSE_SEARCH_BOX = 7,

src/theme/components/format-text.scss

@@ -193,6 +193,13 @@ core-format-text {
     }
 }
 
+// Erase if core-format-text display is contents again.
+.flex > core-format-text {
+    display: flex;
+}
+.core-course-title > p.item-heading > core-format-text {
+    display: inline;
+}
 
 @keyframes loading {
     0% {

src/theme/theme.base.scss

@@ -466,7 +466,7 @@ ion-toolbar {
 
         border-bottom: 3px solid var(--color-base);
 
-        ion-item::part(native) {
+        ion-item {
             --inner-border-width: 0;
         }
         ion-label {
@@ -480,9 +480,9 @@ ion-toolbar {
     .item.core-#{$color-name}-item {
         --color-base: var(--ion-color-#{$color-name});
 
-        --inner-border-width: 0 0 3px 0;
+        --border-width: 0 0 3px 0;
-        --border-width: 0;
+        --border-color: var(--color-base);
-        border-bottom: 3px solid var(--color-base) !important;
+        --inner-border-width: 0;
         ion-icon {
             color: var(--color-base);
         }
@@ -922,7 +922,7 @@ ion-item.ion-activatable:not(.only-links) {
 
         ion-anchor, a,
         ion-button, button,
-        audio, video, select, input {
+        audio, video, select, input, iframe {
             pointer-events: visible;
         }
     }

src/types/config.d.ts

@@ -16,6 +16,7 @@ import { CoreColorScheme, CoreZoomLevel } from '@features/settings/services/sett
 import { CoreMainMenuLocalizedCustomItem } from '@features/mainmenu/services/mainmenu';
 import { CoreSitesDemoSiteData } from '@services/sites';
 import { OpenFileAction } from '@services/utils/utils';
+import { CoreLoginSiteSelectorListMethod } from '@features/login/services/login-helper';
 
 /* eslint-disable @typescript-eslint/naming-convention */
 
@@ -37,7 +38,7 @@ export interface EnvironmentConfig {
     customurlscheme: string;
     siteurl: string;
     sitename: string;
-    multisitesdisplay: string;
+    multisitesdisplay: CoreLoginSiteSelectorListMethod;
     sitefindersettings: Record<string, unknown>;
     onlyallowlistedsites: boolean;
     skipssoconfirmation: boolean;