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

Merge pull request #1508 from crazyserver/MOBILE-2567 

Mobile 2567
main
Juan Leyva 2018-09-10 12:38:16 +02:00 committed by GitHub
parent fff448f763 799f2b7478
commit ac7691987c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/tabs/tabs.scss
View File

@ -48,6 +48,18 @@ ion-app.app-root .core-tabs-bar {
} }
} }
@include rtl() {
.swiper-container-horizontal {
transform: scaleX(-1);
.swiper-wrapper {
flex-direction: row-reverse;
ion-slide {
transform: scaleX(-1);
}
}
}
}
} }
ion-app.app-root.md .core-tabs-bar a.tab-slide { ion-app.app-root.md .core-tabs-bar a.tab-slide {

8
src/core/grades/components/course/core-grades-course.html
View File

@ -10,24 +10,26 @@
<table cellspacing="0" cellpadding="0" class="core-grades-table"> <table cellspacing="0" cellpadding="0" class="core-grades-table">
<thead> <thead>
<tr> <tr>
<th *ngFor="let column of gradesTable.columns" id="{{column.name}}" [class.hidden-phone]="column.hiddenPhone" [attr.colspan]="column.colspan"> <th *ngFor="let column of gradesTable.columns" id="{{column.name}}" [class.hidden-phone]="column.hiddenPhone" [attr.colspan]="column.colspan" text-start>
{{ 'core.grades.' + column.name | translate }} {{ 'core.grades.' + column.name | translate }}
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr *ngFor="let row of gradesTable.rows" (click)="row.itemtype != 'category' && gotoGrade(row.id)" [class]="row.rowclass"> <tr *ngFor="let row of gradesTable.rows" (click)="row.itemtype != 'category' && gotoGrade(row.id)" [class]="row.rowclass">
<ng-container *ngIf="row.itemtype">
<td *ngIf="row.itemtype == 'category'" class="core-grades-table-category" [attr.rowspan]="row.rowspan"> <td *ngIf="row.itemtype == 'category'" class="core-grades-table-category" [attr.rowspan]="row.rowspan">
</td> </td>
<th class="core-grades-table-gradeitem" [class.column-itemname]="row.itemtype == 'category'" [attr.colspan]="row.colspan" [class.core-split-item-selected]="gradeId == row.id"> <th class="core-grades-table-gradeitem" [class.column-itemname]="row.itemtype == 'category'" [attr.colspan]="row.colspan" [class.core-split-item-selected]="gradeId == row.id" text-start>
<core-icon *ngIf="row.icon" name="{{row.icon}}" item-start></core-icon> <core-icon *ngIf="row.icon" name="{{row.icon}}" item-start></core-icon>
<img *ngIf="row.image" [src]="row.image" item-start/> <img *ngIf="row.image" [src]="row.image" item-start/>
<span [innerHTML]="row.gradeitem"></span> <span [innerHTML]="row.gradeitem"></span>
</th> </th>
<ng-container *ngFor="let column of gradesTable.columns"> <ng-container *ngFor="let column of gradesTable.columns">
<td *ngIf="column.name != 'gradeitem' && row[column.name] != undefined" [class]="'core-grades-table-' + column.name" [innerHTML]="row[column.name]" [class.hidden-phone]="column.hiddenPhone"> <td *ngIf="column.name != 'gradeitem' && row[column.name] != undefined" [class]="'core-grades-table-' + column.name" [innerHTML]="row[column.name]" [class.hidden-phone]="column.hiddenPhone" text-start>
</td> </td>
</ng-container> </ng-container>
</ng-container>
</tr> </tr>
</tbody> </tbody>
</table> </table>

2
src/core/grades/providers/helper.ts
View File

@ -156,8 +156,6 @@ export class CoreGradesHelperProvider {
}; };
formatted.rows = table.tabledata.map((row: any) => { formatted.rows = table.tabledata.map((row: any) => {
return this.formatGradeRowForTable(row); return this.formatGradeRowForTable(row);
}).filter((row: any) => {
return typeof row.gradeitem !== 'undefined';
}); });
// Get a row with some info. // Get a row with some info.