EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-2327 courses: Condesate the course progress styles

main
Pau Ferrer Ocaña 2018-02-28 17:02:39 +01:00
parent 86edc5f2b0
commit 2911cbb1aa
13 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/addon/calendar/providers/mainmenu-handler.ts
View File

@ -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) { }

2
src/addon/files/providers/mainmenu-handler.ts
View File

@ -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) { }

2
src/addon/messages/providers/mainmenu-handler.ts
View File

@ -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;

7
src/app/app.scss
View File

@ -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 {

6
src/core/courses/components/course-progress/course-progress.html
View File

@ -1,6 +1,5 @@
<ion-card>
<ion-item tappable text-wrap detail-none (click)="openCourse(course)" [title]="course.fullname">
<div class="core-course-link">
<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">
@ -11,12 +10,11 @@
<!-- Download course spinner. -->
<ion-spinner *ngIf="prefetchCourseData.prefetchCourseIcon == 'spinner'"></ion-spinner>
</div>
</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>

41
src/core/courses/components/course-progress/course-progress.scss
View File

@ -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;
}
}
.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;
}
}
}

2
src/core/courses/providers/mainmenu-handler.ts
View File

@ -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'

2
src/core/grades/providers/course-option-handler.ts
View File

@ -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 {

2
src/core/grades/providers/mainmenu-handler.ts
View File

@ -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) { }

2
src/core/user/providers/course-option-handler.ts
View File

@ -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 {

2
src/core/user/providers/user.ts
View File

@ -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,

1
tsconfig.json
View File

@ -18,7 +18,6 @@
"@classes/*": ["classes/*"],
"@core/*": ["core/*"],
"@providers/*": ["providers/*"],
"@utils": ["providers/utils/*"],
"@components": ["components/*"],
"@directives": ["directives/directives.module"],
"@pipes": ["pipes/pipes.module"]

1
webpack.config.js
View File

@ -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')