From 2911cbb1aabe9fdc817f48b012ac7c9b4da92e37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 28 Feb 2018 17:02:39 +0100
Subject: [PATCH] MOBILE-2327 courses: Condesate the course progress styles

---
 .../calendar/providers/mainmenu-handler.ts    |  2 +-
 src/addon/files/providers/mainmenu-handler.ts |  2 +-
 .../messages/providers/mainmenu-handler.ts    |  2 +-
 src/app/app.scss                              |  7 +++
 .../course-progress/course-progress.html      | 22 +++++----
 .../course-progress/course-progress.scss      | 45 +++++++++----------
 .../courses/providers/mainmenu-handler.ts     |  2 +-
 .../grades/providers/course-option-handler.ts |  2 +-
 src/core/grades/providers/mainmenu-handler.ts |  2 +-
 .../user/providers/course-option-handler.ts   |  2 +-
 src/core/user/providers/user.ts               |  2 +-
 tsconfig.json                                 |  1 -
 webpack.config.js                             |  1 -
 13 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/src/addon/calendar/providers/mainmenu-handler.ts b/src/addon/calendar/providers/mainmenu-handler.ts
index 555e271fd..92e038527 100644
--- a/src/addon/calendar/providers/mainmenu-handler.ts
+++ b/src/addon/calendar/providers/mainmenu-handler.ts
@@ -22,7 +22,7 @@ import { CoreMainMenuHandler, CoreMainMenuHandlerData } from '../../../core/main
 @Injectable()
 export class AddonCalendarMainMenuHandler implements CoreMainMenuHandler {
     name = 'AddonCalendar';
-    priority = 400;
+    priority = 900;
 
     constructor(private calendarProvider: AddonCalendarProvider) { }
 
diff --git a/src/addon/files/providers/mainmenu-handler.ts b/src/addon/files/providers/mainmenu-handler.ts
index fb7e82d71..44c1bfd09 100644
--- a/src/addon/files/providers/mainmenu-handler.ts
+++ b/src/addon/files/providers/mainmenu-handler.ts
@@ -22,7 +22,7 @@ import { CoreMainMenuHandler, CoreMainMenuHandlerData } from '../../../core/main
 @Injectable()
 export class AddonFilesMainMenuHandler implements CoreMainMenuHandler {
     name = 'AddonFiles';
-    priority = 200;
+    priority = 400;
 
     constructor(private filesProvider: AddonFilesProvider) { }
 
diff --git a/src/addon/messages/providers/mainmenu-handler.ts b/src/addon/messages/providers/mainmenu-handler.ts
index dcee4cc5f..496251bfc 100644
--- a/src/addon/messages/providers/mainmenu-handler.ts
+++ b/src/addon/messages/providers/mainmenu-handler.ts
@@ -29,7 +29,7 @@ import { AddonPushNotificationsProvider } from '@addon/pushnotifications/provide
 @Injectable()
 export class AddonMessagesMainMenuHandler implements CoreMainMenuHandler, CoreCronHandler {
     name = 'AddonMessages';
-    priority = 600;
+    priority = 800;
     protected badge = '';
     protected loading = true;
 
diff --git a/src/app/app.scss b/src/app/app.scss
index d291bdec9..d5fd9b7ce 100644
--- a/src/app/app.scss
+++ b/src/app/app.scss
@@ -237,7 +237,14 @@ core-format-text[ng-reflect-max-height], *[core-format-text][ng-reflect-max-heig
 
 core-format-text[singleLine="true"], *[core-format-text][singleLine="true"],
 core-format-text[ng-reflect-single-line="true"], *[core-format-text][ng-reflect-single-line="true"] {
+    cursor: pointer;
+    pointer-events: auto;
     white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: block;
+    position: relative;
+    width: 100%;
 }
 
 .core-media-adapt-width {
diff --git a/src/core/courses/components/course-progress/course-progress.html b/src/core/courses/components/course-progress/course-progress.html
index 6eb3c2cd5..ec1484c21 100644
--- a/src/core/courses/components/course-progress/course-progress.html
+++ b/src/core/courses/components/course-progress/course-progress.html
@@ -1,22 +1,20 @@
 <ion-card>
-    <ion-item tappable text-wrap detail-none (click)="openCourse(course)" [title]="course.fullname">
-        <div class="core-course-link">
-            <h2><core-format-text [text]="course.fullname"></core-format-text></h2>
+    <ion-item tappable text-wrap detail-none (click)="openCourse(course)" [title]="course.fullname" class="core-course-link">
+        <h2><core-format-text [text]="course.fullname"></core-format-text></h2>
 
-            <div class="core-button-spinner">
-                <!-- Download course. -->
-                <button *ngIf="prefetchCourseData.prefetchCourseIcon != 'spinner'" ion-button icon-only clear color="dark" (click)="prefetchCourse($event)">
-                    <ion-icon [name]="prefetchCourseData.prefetchCourseIcon"></ion-icon>
-                </button>
-                <!-- Download course spinner. -->
-                <ion-spinner *ngIf="prefetchCourseData.prefetchCourseIcon == 'spinner'"></ion-spinner>
-            </div>
+        <div class="core-button-spinner">
+            <!-- Download course. -->
+            <button *ngIf="prefetchCourseData.prefetchCourseIcon != 'spinner'" ion-button icon-only clear color="dark" (click)="prefetchCourse($event)">
+                <ion-icon [name]="prefetchCourseData.prefetchCourseIcon"></ion-icon>
+            </button>
+            <!-- Download course spinner. -->
+            <ion-spinner *ngIf="prefetchCourseData.prefetchCourseIcon == 'spinner'"></ion-spinner>
         </div>
     </ion-item>
     <ion-item text-wrap *ngIf="course.summary && course.summary.length">
         <p>
             <summary>
-                <core-format-text [text]="course.summary" maxHeight="20"></core-format-text>
+                <core-format-text [text]="course.summary" singleLine="true" clean="true"></core-format-text>
             </summary>
         </p>
     </ion-item>
diff --git a/src/core/courses/components/course-progress/course-progress.scss b/src/core/courses/components/course-progress/course-progress.scss
index f320622ba..5045e97a7 100644
--- a/src/core/courses/components/course-progress/course-progress.scss
+++ b/src/core/courses/components/course-progress/course-progress.scss
@@ -1,34 +1,31 @@
 core-courses-course-progress {
-    &.core-courseoverview {
-        @include media-breakpoint-down(sm) {
-            ion-card.card {
-                margin: 0;
-                border-radius: 0;
-                box-shadow: none;
-                border-bottom: 1px solid $list-border-color;
-                width: 100%;
-                height: 100% !important;
+    ion-card.card {
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+
+        .core-course-link {
+            .item-inner {
+                padding-right: 0;
+            }
+            .label {
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+            }
+            h2 {
+                margins: 6px 0;
+                flex-grow: 1;
             }
         }
-
-        ion-card.card {
-            display: flex;
-            flex-direction: column;
-            justify-content: space-between;
+        .label {
+            margin-top: 0;
+            margin-right: 0;
+            margin-bottom: 0;
         }
     }
 
     button {
         z-index: 1;
     }
-
-    .core-course-link {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-
-        h2 {
-            flex-grow: 1;
-        }
-    }
 }
diff --git a/src/core/courses/providers/mainmenu-handler.ts b/src/core/courses/providers/mainmenu-handler.ts
index da4a035af..6727ff832 100644
--- a/src/core/courses/providers/mainmenu-handler.ts
+++ b/src/core/courses/providers/mainmenu-handler.ts
@@ -54,7 +54,7 @@ export class CoreCoursesMainMenuHandler implements CoreMainMenuHandler {
     getDisplayData(): CoreMainMenuHandlerData {
         if (this.isOverviewEnabled) {
             return {
-                icon: 'ionic',
+                icon: 'home',
                 title: 'core.courses.courseoverview',
                 page: 'CoreCoursesMyOverviewPage',
                 class: 'core-courseoverview-handler'
diff --git a/src/core/grades/providers/course-option-handler.ts b/src/core/grades/providers/course-option-handler.ts
index d2cd4028e..54f9396e7 100644
--- a/src/core/grades/providers/course-option-handler.ts
+++ b/src/core/grades/providers/course-option-handler.ts
@@ -80,7 +80,7 @@ export class CoreGradesCourseOptionHandler implements CoreCourseOptionsHandler {
     /**
      * Returns the data needed to render the handler.
      *
-     * @return {CoreMainMenuHandlerData} Data needed to render the handler.
+     * @return {CoreCourseOptionsHandlerData} Data needed to render the handler.
      */
     getDisplayData(): CoreCourseOptionsHandlerData {
         return {
diff --git a/src/core/grades/providers/mainmenu-handler.ts b/src/core/grades/providers/mainmenu-handler.ts
index ff9ee2ad7..59c2b016e 100644
--- a/src/core/grades/providers/mainmenu-handler.ts
+++ b/src/core/grades/providers/mainmenu-handler.ts
@@ -22,7 +22,7 @@ import { CoreMainMenuHandler, CoreMainMenuHandlerData } from '../../mainmenu/pro
 @Injectable()
 export class CoreGradesMainMenuHandler implements CoreMainMenuHandler {
     name = 'CoreGrades';
-    priority = 950;
+    priority = 600;
 
     constructor(private gradesProvider: CoreGradesProvider) { }
 
diff --git a/src/core/user/providers/course-option-handler.ts b/src/core/user/providers/course-option-handler.ts
index 95ed8173d..c595341b8 100644
--- a/src/core/user/providers/course-option-handler.ts
+++ b/src/core/user/providers/course-option-handler.ts
@@ -79,7 +79,7 @@ export class CoreUserParticipantsCourseOptionHandler implements CoreCourseOption
     /**
      * Returns the data needed to render the handler.
      *
-     * @return {CoreMainMenuHandlerData} Data needed to render the handler.
+     * @return {CoreCourseOptionsHandlerData} Data needed to render the handler.
      */
     getDisplayData(): CoreCourseOptionsHandlerData {
         return {
diff --git a/src/core/user/providers/user.ts b/src/core/user/providers/user.ts
index 866f8bc42..5047b352e 100644
--- a/src/core/user/providers/user.ts
+++ b/src/core/user/providers/user.ts
@@ -415,7 +415,7 @@ export class CoreUserProvider {
      * @param  {string} [siteId] Site ID. If not defined, current site.
      * @return {Promise<any>}    Promise resolved if success.
      */
-    updateUserPreference(name:string, value: any, userId?: number, siteId?: string): Promise<any> {
+    updateUserPreference(name: string, value: any, userId?: number, siteId?: string): Promise<any> {
         const preferences = [
             {
                 type: name,
diff --git a/tsconfig.json b/tsconfig.json
index 911e2b387..369260cfb 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -18,7 +18,6 @@
       "@classes/*": ["classes/*"],
       "@core/*": ["core/*"],
       "@providers/*": ["providers/*"],
-      "@utils": ["providers/utils/*"],
       "@components": ["components/*"],
       "@directives": ["directives/directives.module"],
       "@pipes": ["pipes/pipes.module"]
diff --git a/webpack.config.js b/webpack.config.js
index 113e1ad71..1269ea7d1 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -9,7 +9,6 @@ const customConfig = {
       '@classes': resolve('./src/classes'),
       '@core': resolve('./src/core'),
       '@providers': resolve('./src/providers'),
-      '@utils': resolve('./src/providers/utils'),
       '@components': resolve('./src/components'),
       '@directives': resolve('./src/directives/directives.module'),
       '@pipes': resolve('./src/pipes/pipes.module')