From c68780f51ba15272d7591505df94fcbf0756fd60 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 5 Jul 2018 08:59:21 +0200
Subject: [PATCH] MOBILE-2455 overview: Change order of tabs

---
 src/components/tabs/tabs.scss                 |  3 -
 .../pages/my-overview/my-overview.html        | 66 +++++++++----------
 .../courses/pages/my-overview/my-overview.ts  |  2 +-
 3 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/src/components/tabs/tabs.scss b/src/components/tabs/tabs.scss
index f3f9b452a..af468876f 100644
--- a/src/components/tabs/tabs.scss
+++ b/src/components/tabs/tabs.scss
@@ -45,9 +45,6 @@
             justify-content: center;
             align-items: center;
 
-            ion-icon {
-                color: #ccc;
-            }
         }
     }
 }
diff --git a/src/core/courses/pages/my-overview/my-overview.html b/src/core/courses/pages/my-overview/my-overview.html
index 773301fe5..552d88c91 100644
--- a/src/core/courses/pages/my-overview/my-overview.html
+++ b/src/core/courses/pages/my-overview/my-overview.html
@@ -21,39 +21,6 @@
             </ng-template>
         </core-tab>
 
-        <!-- Timeline tab. -->
-        <core-tab [title]="'core.courses.timeline' | translate" (ionSelect)="tabChanged('timeline')">
-            <ng-template>
-                <ion-content>
-                    <ion-refresher [enabled]="timeline.loaded || timelineCourses.loaded || courses.loaded" (ionRefresh)="refreshMyOverview($event)">
-                        <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
-                    </ion-refresher>
-
-                    <div no-padding [hidden]="!(timeline.loaded || timelineCourses.loaded)">
-                        <ion-select [(ngModel)]="timeline.sort" (ngModelChange)="switchSort()" interface="popover">
-                            <ion-option value="sortbydates">{{ 'core.courses.sortbydates' | translate }}</ion-option>
-                            <ion-option value="sortbycourses">{{ 'core.courses.sortbycourses' | translate }}</ion-option>
-                        </ion-select>
-                    </div>
-                    <core-loading [hideUntil]="timeline.loaded" [hidden]="timeline.sort != 'sortbydates'" class="core-loading-center">
-                        <core-courses-overview-events [events]="timeline.events" showCourse="true" [canLoadMore]="timeline.canLoadMore" (loadMore)="loadMoreTimeline()"></core-courses-overview-events>
-                    </core-loading>
-                    <core-loading [hideUntil]="timelineCourses.loaded" [hidden]="timeline.sort != 'sortbycourses'" class="core-loading-center">
-                        <ion-grid no-padding>
-                            <ion-row no-padding>
-                                <ion-col *ngFor="let course of timelineCourses.courses" no-padding col-12 col-md-6>
-                                    <core-courses-course-progress [course]="course">
-                                        <core-courses-overview-events [events]="course.events" [canLoadMore]="course.canLoadMore" (loadMore)="loadMoreCourse(course)"></core-courses-overview-events>
-                                    </core-courses-course-progress>
-                                </ion-col>
-                            </ion-row>
-                        </ion-grid>
-                        <core-empty-box *ngIf="timelineCourses.courses.length == 0" image="assets/img/icons/courses.svg" [message]="'core.courses.nocoursesoverview' | translate"></core-empty-box>
-                    </core-loading>
-                </ion-content>
-            </ng-template>
-        </core-tab>
-
         <!-- Courses tab. -->
         <core-tab [title]="'core.courses.courses' | translate" (ionSelect)="tabChanged('courses')">
             <ng-template>
@@ -100,5 +67,38 @@
                 </ion-content>
             </ng-template>
         </core-tab>
+
+        <!-- Timeline tab. -->
+        <core-tab [title]="'core.courses.timeline' | translate" (ionSelect)="tabChanged('timeline')">
+            <ng-template>
+                <ion-content>
+                    <ion-refresher [enabled]="timeline.loaded || timelineCourses.loaded || courses.loaded" (ionRefresh)="refreshMyOverview($event)">
+                        <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
+                    </ion-refresher>
+
+                    <div no-padding [hidden]="!(timeline.loaded || timelineCourses.loaded)">
+                        <ion-select [(ngModel)]="timeline.sort" (ngModelChange)="switchSort()" interface="popover">
+                            <ion-option value="sortbydates">{{ 'core.courses.sortbydates' | translate }}</ion-option>
+                            <ion-option value="sortbycourses">{{ 'core.courses.sortbycourses' | translate }}</ion-option>
+                        </ion-select>
+                    </div>
+                    <core-loading [hideUntil]="timeline.loaded" [hidden]="timeline.sort != 'sortbydates'" class="core-loading-center">
+                        <core-courses-overview-events [events]="timeline.events" showCourse="true" [canLoadMore]="timeline.canLoadMore" (loadMore)="loadMoreTimeline()"></core-courses-overview-events>
+                    </core-loading>
+                    <core-loading [hideUntil]="timelineCourses.loaded" [hidden]="timeline.sort != 'sortbycourses'" class="core-loading-center">
+                        <ion-grid no-padding>
+                            <ion-row no-padding>
+                                <ion-col *ngFor="let course of timelineCourses.courses" no-padding col-12 col-md-6>
+                                    <core-courses-course-progress [course]="course">
+                                        <core-courses-overview-events [events]="course.events" [canLoadMore]="course.canLoadMore" (loadMore)="loadMoreCourse(course)"></core-courses-overview-events>
+                                    </core-courses-course-progress>
+                                </ion-col>
+                            </ion-row>
+                        </ion-grid>
+                        <core-empty-box *ngIf="timelineCourses.courses.length == 0" image="assets/img/icons/courses.svg" [message]="'core.courses.nocoursesoverview' | translate"></core-empty-box>
+                    </core-loading>
+                </ion-content>
+            </ng-template>
+        </core-tab>
     </core-tabs>
 </ion-content>
\ No newline at end of file
diff --git a/src/core/courses/pages/my-overview/my-overview.ts b/src/core/courses/pages/my-overview/my-overview.ts
index 16ba471bb..63ef5c4af 100644
--- a/src/core/courses/pages/my-overview/my-overview.ts
+++ b/src/core/courses/pages/my-overview/my-overview.ts
@@ -114,7 +114,7 @@ export class CoreCoursesMyOverviewPage implements OnDestroy {
                 displaySiteHome = site.getInfo() && site.getInfo().userhomepage === 0;
 
             this.siteHomeEnabled = enabled;
-            this.firstSelectedTab = displaySiteHome ? 0 : 2;
+            this.firstSelectedTab = displaySiteHome ? 0 : 1;
             this.tabsReady = true;
         });
     }