From 6663fe0bb483458a5c955ce8510baa7cbcb62e83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 20 Feb 2019 13:37:47 +0100
Subject: [PATCH 1/2] MOBILE-2888 login: Make url optional in multi site
 selector

---
 src/core/login/pages/site/site.html | 4 ++--
 src/core/login/pages/site/site.ts   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/login/pages/site/site.html b/src/core/login/pages/site/site.html
index 28007d119..1b7d34d97 100644
--- a/src/core/login/pages/site/site.html
+++ b/src/core/login/pages/site/site.html
@@ -36,13 +36,13 @@
             <button ion-button block [disabled]="!siteForm.valid">{{ 'core.login.connect' | translate }}</button>
         </form>
         <!-- Pick the site from a list of fixed sites. -->
-        <ion-list *ngIf="fixedSites && fixedDisplay == 'list'">
+        <ion-list *ngIf="fixedSites && (fixedDisplay == 'list' || fixedDisplay == 'listnourl')">
             <p class="padding no-padding-bottom">{{ 'core.login.selectsite' | translate }}</p>
 
             <ion-searchbar *ngIf="fixedSites.length > 4" [(ngModel)]="filter" (ionInput)="filterChanged($event)" (ionCancel)="filterChanged()" [placeholder]="'core.login.findyoursite' | translate"></ion-searchbar>
             <ion-item *ngFor="let site of filteredSites" (click)="connect($event, site.url)" [title]="site.name" detail-push text-wrap>
                 <h2>{{site.name}}</h2>
-                <p>{{site.url}}</p>
+                <p *ngIf="fixedDisplay == 'list'">{{site.url}}</p>
             </ion-item>
         </ion-list>
 
diff --git a/src/core/login/pages/site/site.ts b/src/core/login/pages/site/site.ts
index 2386735f8..c4bd86fda 100644
--- a/src/core/login/pages/site/site.ts
+++ b/src/core/login/pages/site/site.ts
@@ -50,7 +50,7 @@ export class CoreLoginSitePage {
             this.fixedSites = <any[]> this.loginHelper.getFixedSites();
             this.fixedDisplay = CoreConfigConstants.multisitesdisplay;
             // Autoselect if not defined.
-            if (['list', 'select', 'buttons'].indexOf(this.fixedDisplay) < 0) {
+            if (['list', 'listnourl', 'select', 'buttons'].indexOf(this.fixedDisplay) < 0) {
                 this.fixedDisplay = this.fixedSites.length > 8 ? 'list' : (this.fixedSites.length > 3 ? 'select' : 'buttons');
             }
             this.filteredSites = this.fixedSites;

From a9c39d93a08223d831bc6fff6c7721e47a2be5cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 20 Feb 2019 15:25:27 +0100
Subject: [PATCH 2/2] MOBILE-2888 login: Add a heading style

---
 src/core/login/pages/site-error/site-error.scss | 3 +++
 src/core/login/pages/site/site.html             | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 src/core/login/pages/site-error/site-error.scss

diff --git a/src/core/login/pages/site-error/site-error.scss b/src/core/login/pages/site-error/site-error.scss
new file mode 100644
index 000000000..510539e27
--- /dev/null
+++ b/src/core/login/pages/site-error/site-error.scss
@@ -0,0 +1,3 @@
+    page-core-login-site-error button.button.button-block {
+        margin-bottom: 3rem;
+    }
\ No newline at end of file
diff --git a/src/core/login/pages/site/site.html b/src/core/login/pages/site/site.html
index 1b7d34d97..9503d5335 100644
--- a/src/core/login/pages/site/site.html
+++ b/src/core/login/pages/site/site.html
@@ -37,8 +37,7 @@
         </form>
         <!-- Pick the site from a list of fixed sites. -->
         <ion-list *ngIf="fixedSites && (fixedDisplay == 'list' || fixedDisplay == 'listnourl')">
-            <p class="padding no-padding-bottom">{{ 'core.login.selectsite' | translate }}</p>
-
+            <ion-item no-lines><h2 class="item-heading">{{ 'core.login.selectsite' | translate }}</h2></ion-item>
             <ion-searchbar *ngIf="fixedSites.length > 4" [(ngModel)]="filter" (ionInput)="filterChanged($event)" (ionCancel)="filterChanged()" [placeholder]="'core.login.findyoursite' | translate"></ion-searchbar>
             <ion-item *ngFor="let site of filteredSites" (click)="connect($event, site.url)" [title]="site.name" detail-push text-wrap>
                 <h2>{{site.name}}</h2>