From 893bb3c3a811a5fa1ede79bdd757ad81b41ae8bb Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 29 Oct 2020 15:57:15 +0100
Subject: [PATCH] MOBILE-3565 core: Fix some template warnings

---
 .../login/pages/credentials/credentials.html  | 21 +++++++++++++------
 src/app/core/login/pages/site/site.html       | 18 +++++++++++-----
 src/app/core/login/pages/sites/sites.html     |  3 ++-
 src/app/core/mainmenu/pages/more/more.html    |  8 +++++--
 4 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/src/app/core/login/pages/credentials/credentials.html b/src/app/core/login/pages/credentials/credentials.html
index 3abc3c495..bf8dfa698 100644
--- a/src/app/core/login/pages/credentials/credentials.html
+++ b/src/app/core/login/pages/credentials/credentials.html
@@ -23,13 +23,16 @@
                 <img *ngIf="!logoUrl" src="assets/img/login_logo.png" role="presentation">
             </div>
 
-            <h3 *ngIf="siteName" class="ion-padding core-sitename"><core-format-text [text]="siteName" [filter]="false"></core-format-text></h3>
+            <h3 *ngIf="siteName" class="ion-padding core-sitename">
+                <core-format-text [text]="siteName" [filter]="false"></core-format-text>
+            </h3>
             <p class="core-siteurl">{{siteUrl}}</p>
         </div>
 
         <form ion-list [formGroup]="credForm" (ngSubmit)="login($event)" class="core-login-form" #credentialsForm>
             <ion-item *ngIf="siteChecked && !isBrowserSSO">
-                <ion-input type="text" name="username" placeholder="{{ 'core.login.username' | translate }}" formControlName="username" autocapitalize="none" autocorrect="off"></ion-input>
+                <ion-input type="text" name="username" placeholder="{{ 'core.login.username' | translate }}"
+                    formControlName="username" autocapitalize="none" autocorrect="off"></ion-input>
             </ion-item>
             <ion-item *ngIf="siteChecked && !isBrowserSSO" class="ion-margin-bottom">
                 <core-show-password [name]="'password'">
@@ -39,8 +42,12 @@
                     </ion-input>
                 </core-show-password>
             </ion-item>
-            <ion-button expand="block" type="submit" [disabled]="siteChecked && !isBrowserSSO && !credForm.valid" class="ion-margin core-login-login-button">{{ 'core.login.loginbutton' | translate }}</ion-button>
-            <input type="submit" class="core-submit-hidden-enter" /> <!-- Remove this once Ionic fixes this bug: https://github.com/ionic-team/ionic-framework/issues/19368 -->
+            <ion-button expand="block" type="submit" [disabled]="siteChecked && !isBrowserSSO && !credForm.valid"
+                class="ion-margin core-login-login-button">
+                {{ 'core.login.loginbutton' | translate }}
+            </ion-button>
+             <!-- Remove this once Ionic fixes this bug: https://github.com/ionic-team/ionic-framework/issues/19368 -->
+            <input type="submit" class="core-submit-hidden-enter" />
 
             <ng-container *ngIf="showScanQR">
                 <div class="ion-text-center ion-padding">{{ 'core.login.or' | translate }}</div>
@@ -62,7 +69,8 @@
             <ion-item class="ion-text-wrap" lines="none">
                 <ion-label><h3 class="item-heading">{{ 'core.login.potentialidps' | translate }}</h3></ion-label>
             </ion-item>
-            <ion-item button *ngFor="let provider of identityProviders" class="ion-text-wrap core-oauth-icon" (click)="oauthClicked(provider)" title="{{provider.name}}">
+            <ion-item button *ngFor="let provider of identityProviders" class="ion-text-wrap core-oauth-icon"
+                (click)="oauthClicked(provider)" title="{{provider.name}}">
                 <img [src]="provider.iconurl" alt="" width="32" height="32" slot="start">
                 <ion-label>{{provider.name}}</ion-label>
             </ion-item>
@@ -75,7 +83,8 @@
             <ion-item class="ion-text-wrap" lines="none" *ngIf="authInstructions">
                 <ion-label><p><core-format-text [text]="authInstructions" [filter]="false"></core-format-text></p></ion-label>
             </ion-item>
-            <ion-button expand="block" class="ion-margin" color="light" router-direction="forward" routerLink="/login/emailsignup" [queryParams]="{siteUrl: siteUrl}">
+            <ion-button expand="block" class="ion-margin" color="light" router-direction="forward" routerLink="/login/emailsignup"
+                [queryParams]="{siteUrl: siteUrl}">
                 {{ 'core.login.startsignup' | translate }}
             </ion-button>
         </ion-list>
diff --git a/src/app/core/login/pages/site/site.html b/src/app/core/login/pages/site/site.html
index 55305ec6b..61d2434f0 100644
--- a/src/app/core/login/pages/site/site.html
+++ b/src/app/core/login/pages/site/site.html
@@ -7,7 +7,8 @@
         <ion-title>{{ 'core.login.connecttomoodle' | translate }}</ion-title>
 
         <ion-buttons slot="end">
-            <ion-button router-direction="forward" routerLink="/settings/app" [attr.aria-label]="'core.settings.appsettings' | translate">
+            <ion-button router-direction="forward" routerLink="/settings/app"
+                [attr.aria-label]="'core.settings.appsettings' | translate">
                 <ion-icon slot="icon-only" name="fa-cog"></ion-icon>
             </ion-button>
         </ion-buttons>
@@ -25,7 +26,9 @@
                 <ion-label position="stacked">
                     <h2>{{ 'core.login.siteaddress' | translate }}</h2>
                 </ion-label>
-                <ion-input name="url" type="url" placeholder="{{ 'core.login.siteaddressplaceholder' | translate }}" formControlName="siteUrl" [core-auto-focus]="showKeyboard && !showScanQR"></ion-input>
+                <ion-input name="url" type="url" placeholder="{{ 'core.login.siteaddressplaceholder' | translate }}"
+                    formControlName="siteUrl" [core-auto-focus]="showKeyboard && !showScanQR">
+                </ion-input>
             </ion-item>
         </ng-container>
         <ng-container *ngIf="siteSelector != 'url'">
@@ -33,7 +36,9 @@
                 <ion-label position="stacked">
                     <h2>{{ 'core.login.siteaddress' | translate }}</h2>
                 </ion-label>
-                <ion-input name="url" placeholder="{{ 'core.login.siteaddressplaceholder' | translate }}" formControlName="siteUrl" [core-auto-focus]="showKeyboard && !showScanQR" (ionChange)="searchSite($event, siteForm.value.siteUrl)"></ion-input>
+                <ion-input name="url" placeholder="{{ 'core.login.siteaddressplaceholder' | translate }}" formControlName="siteUrl"
+                    [core-auto-focus]="showKeyboard && !showScanQR" (ionChange)="searchSite($event, siteForm.value.siteUrl)">
+                </ion-input>
             </ion-item>
 
             <ion-list [class.hidden]="!hasSites && !enteredSiteUrl" class="core-login-site-list">
@@ -42,7 +47,8 @@
                         <h2 class="item-heading">{{ 'core.login.selectsite' | translate }}</h2>
                     </ion-label>
                 </ion-item>
-                <ion-item button *ngIf="enteredSiteUrl" (click)="connect($event, enteredSiteUrl.url)" [attr.aria-label]="'core.login.connect' | translate" detail-push class="core-login-entered-site">
+                <ion-item button *ngIf="enteredSiteUrl" (click)="connect($event, enteredSiteUrl.url)"
+                    [attr.aria-label]="'core.login.connect' | translate" detail-push class="core-login-entered-site">
                     <ion-thumbnail slot="start">
                         <ion-icon name="fa-pencil-alt"></ion-icon>
                     </ion-thumbnail>
@@ -80,7 +86,9 @@
                     <h2 class="item-heading">{{ 'core.login.selectsite' | translate }}</h2>
                 </ion-label>
             </ion-item>
-            <ion-searchbar *ngIf="fixedSites.length > 4" [(ngModel)]="filter" (ionInput)="filterChanged($event)" (ionCancel)="filterChanged()" [placeholder]="'core.login.findyoursite' | translate"></ion-searchbar>
+            <ion-searchbar *ngIf="fixedSites.length > 4" [(ngModel)]="filter" (ionInput)="filterChanged($event)"
+                (ionCancel)="filterChanged()" [placeholder]="'core.login.findyoursite' | translate">
+            </ion-searchbar>
             <ng-container *ngFor="let site of filteredSites">
                 <ng-container *ngTemplateOutlet="site"></ng-container>
             </ng-container>
diff --git a/src/app/core/login/pages/sites/sites.html b/src/app/core/login/pages/sites/sites.html
index 77a9db11f..e80ca602e 100644
--- a/src/app/core/login/pages/sites/sites.html
+++ b/src/app/core/login/pages/sites/sites.html
@@ -21,7 +21,8 @@
     <ion-list>
         <ion-item button (click)="login(site.id)" *ngFor="let site of sites">
             <ion-avatar slot="start">
-                <img [src]="site.avatar" core-external-content [siteId]="site.id" alt="{{ 'core.pictureof' | translate:{$a: site.fullName} }}" role="presentation" onError="this.src='assets/img/user-avatar.png'">
+                <img [src]="site.avatar" core-external-content [siteId]="site.id" role="presentation"
+                    alt="{{ 'core.pictureof' | translate:{$a: site.fullName} }}" onError="this.src='assets/img/user-avatar.png'">
             </ion-avatar>
             <ion-label>
                 <h2>{{site.fullName}}</h2>
diff --git a/src/app/core/mainmenu/pages/more/more.html b/src/app/core/mainmenu/pages/more/more.html
index 5edaa06e7..92ed80e86 100644
--- a/src/app/core/mainmenu/pages/more/more.html
+++ b/src/app/core/mainmenu/pages/more/more.html
@@ -13,7 +13,10 @@
             <ion-avatar slot="start"></ion-avatar> <!-- @todo core-user-avatar [user]="siteInfo" -->
             <ion-label>
                 <h2>{{siteInfo.fullname}}</h2>
-                <p><core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0" [wsNotFiltered]="true"></core-format-text></p>
+                <p>
+                    <core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0" [wsNotFiltered]="true">
+                    </core-format-text>
+                </p>
                 <p>{{ siteUrl }}</p>
             </ion-label>
         </ion-item>
@@ -27,7 +30,8 @@
             <ion-label>
                 <h2>{{ handler.title | translate}}</h2>
             </ion-label>
-            <ion-badge slot="end" *ngIf="handler.showBadge" [hidden]="handler.loading || !handler.badge">{{handler.badge}}</ion-badge>
+            <ion-badge slot="end" *ngIf="handler.showBadge" [hidden]="handler.loading || !handler.badge">{{handler.badge}}
+            </ion-badge>
             <ion-spinner slot="end" *ngIf="handler.showBadge && handler.loading"></ion-spinner>
         </ion-item>
         <ng-container *ngFor="let item of customItems">