GuzhavinAleksey/Vmeda.Online
1
0
Fork 0
forked from CIT/Vmeda.Online
Code Pull Requests Activity

Merge pull request #2110 from crazyserver/MOBILE-2862

Browse Source 
MOBILE-2862 forum: Update discussion template
This commit is contained in:
Juan Leyva 2019-10-01 12:39:31 +02:00 committed by GitHub
commit 3491d9cc49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 46 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/langindex.json
View File

@ -580,6 +580,7 @@
"addon.mod_forum.favouriteupdated": "forum", "addon.mod_forum.favouriteupdated": "forum",
"addon.mod_forum.forumnodiscussionsyet": "local_moodlemobileapp", "addon.mod_forum.forumnodiscussionsyet": "local_moodlemobileapp",
"addon.mod_forum.group": "local_moodlemobileapp", "addon.mod_forum.group": "local_moodlemobileapp",
"addon.mod_forum.lastpost": "forum",
"addon.mod_forum.lockdiscussion": "forum", "addon.mod_forum.lockdiscussion": "forum",
"addon.mod_forum.lockupdated": "forum", "addon.mod_forum.lockupdated": "forum",
"addon.mod_forum.message": "forum", "addon.mod_forum.message": "forum",

72
src/addon/mod/forum/components/index/addon-mod-forum-index.html
View File

@ -35,66 +35,64 @@
<core-empty-box *ngIf="discussions.length == 0 && offlineDiscussions.length == 0" icon="chatbubbles" [message]="'addon.mod_forum.forumnodiscussionsyet' | translate"> <core-empty-box *ngIf="discussions.length == 0 && offlineDiscussions.length == 0" icon="chatbubbles" [message]="'addon.mod_forum.forumnodiscussionsyet' | translate">
</core-empty-box> </core-empty-box>
<div text-wrap *ngIf="sortingAvailable && selectedSortOrder" ion-row padding-horizontal padding-top margin-bottom> <div text-wrap *ngIf="discussions.length > 0 && sortingAvailable && selectedSortOrder" ion-row padding-horizontal padding-top margin-bottom>
<button *ngIf="sortingAvailable" ion-button padding-horizontal icon-end ion-col (click)="showSortOrderSelector($event)" color="light" class="core-button-select button-no-uppercase" [attr.aria-label]="('core.sort' | translate)" aria-haspopup="true" [attr.aria-expanded]="sortOrderSelectorExpanded" aria-controls="addon-mod-forum-sort-order-selector" id="addon-mod-forum-sort-order-button"> <button *ngIf="sortingAvailable" ion-button padding-horizontal icon-end ion-col (click)="showSortOrderSelector($event)" color="light" class="core-button-select button-no-uppercase" [attr.aria-label]="('core.sort' | translate)" aria-haspopup="true" [attr.aria-expanded]="sortOrderSelectorExpanded" aria-controls="addon-mod-forum-sort-order-selector" id="addon-mod-forum-sort-order-button">
<span class="core-section-selector-text">{{ selectedSortOrder.label | translate }}</span> <span class="core-button-select-text">{{ selectedSortOrder.label | translate }}</span>
<ion-icon name="arrow-dropdown" ios="md-arrow-dropdown"></ion-icon> <ion-icon name="arrow-dropdown" ios="md-arrow-dropdown"></ion-icon>
</button> </button>
</div> </div>
<ion-card *ngFor="let discussion of offlineDiscussions" (click)="openNewDiscussion(discussion.timecreated)" [class.addon-forum-discussion-selected]="discussion.timecreated == -selectedDiscussion"> <ng-container *ngFor="let discussion of offlineDiscussions">
<ion-item text-wrap> <ion-item text-wrap (click)="openNewDiscussion(discussion.timecreated)" [attr.no-lines]="discussion.groupname" [class.core-split-item-selected]="discussion.timecreated == -selectedDiscussion">
<ion-avatar core-user-avatar [user]="discussion" item-start [courseId]="courseId"></ion-avatar> <ion-avatar core-user-avatar [user]="discussion" item-start [courseId]="courseId"></ion-avatar>
<h2><core-format-text [text]="discussion.subject"></core-format-text></h2> <h2><core-format-text [text]="discussion.subject"></core-format-text></h2>
<p *ngIf="discussion.userfullname"> <h3 *ngIf="discussion.userfullname">
<ion-note float-end padding-left><ion-icon name="time"></ion-icon> {{ 'core.notsent' | translate }}</ion-note> <ion-note float-end padding-left><ion-icon name="time"></ion-icon> {{ 'core.notsent' | translate }}</ion-note>
{{discussion.userfullname}} {{discussion.userfullname}}
</p> </h3>
</ion-item> </ion-item>
<ion-card-content> <ion-item *ngIf="discussion.groupname" (click)="openNewDiscussion(discussion.timecreated)" [class.core-split-item-selected]="discussion.timecreated == -selectedDiscussion">
<ion-note text-end *ngIf="discussion.groupname"> <ion-note text-end>
<ion-icon name="people"></ion-icon> {{ discussion.groupname }} <ion-icon name="people"></ion-icon> {{ discussion.groupname }}
</ion-note> </ion-note>
<p><core-format-text [maxHeight]="60" [component]="component" [componentId]="componentId" [text]="discussion.message"></core-format-text></p> </ion-item>
</ion-card-content> </ng-container>
</ion-card> <ng-container *ngFor="let discussion of discussions">
<ion-card *ngFor="let discussion of discussions" (click)="openDiscussion(discussion)" [class.addon-forum-discussion-selected]="discussion.discussion == selectedDiscussion"> <ion-item text-wrap (click)="openDiscussion(discussion)" no-lines [class.core-split-item-selected]="discussion.discussion == selectedDiscussion">
<ion-item text-wrap>
<ion-avatar core-user-avatar [user]="discussion" item-start [courseId]="courseId"></ion-avatar> <ion-avatar core-user-avatar [user]="discussion" item-start [courseId]="courseId"></ion-avatar>
<h2> <h2>
<core-icon name="fa-map-pin" *ngIf="discussion.pinned"></core-icon> <core-icon name="fa-map-pin" *ngIf="discussion.pinned"></core-icon>
<core-icon name="fa-star" class="addon-forum-star" *ngIf="!discussion.pinned && discussion.starred"></core-icon> <core-icon name="fa-star" class="addon-forum-star" *ngIf="!discussion.pinned && discussion.starred"></core-icon>
<core-format-text [text]="discussion.subject"></core-format-text> <core-format-text [text]="discussion.subject"></core-format-text>
</h2> </h2>
<p> <h3>
<ion-note float-end padding-left text-end> <ion-note float-end padding-left text-end>
{{discussion.created | coreDateDayOrTime}}
<div *ngIf="discussion.numunread"><core-icon name="fa-circle" color="primary"></core-icon> {{ 'addon.mod_forum.unreadpostsnumber' | translate:{ '$a' : discussion.numunread} }}</div> <div *ngIf="discussion.numunread"><core-icon name="fa-circle" color="primary"></core-icon> {{ 'addon.mod_forum.unreadpostsnumber' | translate:{ '$a' : discussion.numunread} }}</div>
</ion-note> </ion-note>
{{discussion.userfullname}} {{discussion.userfullname}}
</p> </h3>
<p>{{discussion.created | coreDateDayOrTime}}</p>
</ion-item> </ion-item>
<ion-card-content> <ion-item (click)="openDiscussion(discussion)" [class.core-split-item-selected]="discussion.discussion == selectedDiscussion">
<core-format-text [maxHeight]="60" [component]="component" [componentId]="componentId" [text]="discussion.message"></core-format-text> <ion-row text-center>
</ion-card-content> <ion-col *ngIf="discussion.groupname">
<ion-row text-center> <ion-note>
<ion-col *ngIf="discussion.groupname"> <ion-icon name="people"></ion-icon> {{ discussion.groupname }}
<ion-note> </ion-note>
<ion-icon name="people"></ion-icon> {{ discussion.groupname }} </ion-col>
</ion-note> <ion-col>
</ion-col> <ion-note>
<ion-col> <ion-icon name="chatboxes"></ion-icon> {{ 'addon.mod_forum.numreplies' | translate:{numreplies: discussion.numreplies} }}
<ion-note> </ion-note>
<ion-icon name="chatboxes"></ion-icon> {{ 'addon.mod_forum.numreplies' | translate:{numreplies: discussion.numreplies} }} </ion-col>
</ion-note> <ion-col *ngIf="discussion.timemodified > discussion.created">
</ion-col> <ion-note>
<ion-col *ngIf="discussion.timemodified > discussion.created"> <ion-icon name="time"></ion-icon> {{ 'addon.mod_forum.lastpost' | translate }} {{discussion.timemodified | coreTimeAgo}}
<ion-note> </ion-note>
<ion-icon name="time"></ion-icon> {{discussion.timemodified | coreTimeAgo}} </ion-col>
</ion-note> </ion-row>
</ion-col> </ion-item>
</ion-row> </ng-container>
</ion-card>
<core-infinite-loading [enabled]="canLoadMore" (action)="fetchMoreDiscussions($event)" [error]="loadMoreError"></core-infinite-loading> <core-infinite-loading [enabled]="canLoadMore" (action)="fetchMoreDiscussions($event)" [error]="loadMoreError"></core-infinite-loading>
</ng-container> </ng-container>

11
src/addon/mod/forum/components/index/index.scss
View File

@ -1,16 +1,5 @@
ion-app.app-root addon-mod-forum-index { ion-app.app-root addon-mod-forum-index {
.addon-forum-discussion-selected {
border-top: 5px solid $core-splitview-selected;
}
.addon-forum-star { .addon-forum-star {
color: $core-star-color; color: $core-star-color;
} }
button.core-button-select .core-section-selector-text {
overflow: hidden;
text-overflow: ellipsis;
line-height: 2em;
white-space: nowrap;
}
} }

1
src/addon/mod/forum/lang/en.json
View File

@ -28,6 +28,7 @@
"favouriteupdated": "Your star option has been updated.", "favouriteupdated": "Your star option has been updated.",
"forumnodiscussionsyet": "There are no discussions yet in this forum.", "forumnodiscussionsyet": "There are no discussions yet in this forum.",
"group": "Group", "group": "Group",
"lastpost": "Last post",
"lockdiscussion": "Lock this discussion", "lockdiscussion": "Lock this discussion",
"lockupdated": "The lock option has been updated.", "lockupdated": "The lock option has been updated.",
"message": "Message", "message": "Message",

7
src/app/app.scss
View File

@ -503,6 +503,13 @@ ion-app.app-root {
} }
} }
button.core-button-select .core-button-select-text {
overflow: hidden;
text-overflow: ellipsis;
line-height: 2em;
white-space: nowrap;
}
// File uploader. // File uploader.
// ------------------------- // -------------------------
.core-fileuploader-file-handler { .core-fileuploader-file-handler {

1
src/assets/lang/en.json
View File

@ -579,6 +579,7 @@
"addon.mod_forum.favouriteupdated": "Your star option has been updated.", "addon.mod_forum.favouriteupdated": "Your star option has been updated.",
"addon.mod_forum.forumnodiscussionsyet": "There are no discussions yet in this forum.", "addon.mod_forum.forumnodiscussionsyet": "There are no discussions yet in this forum.",
"addon.mod_forum.group": "Group", "addon.mod_forum.group": "Group",
"addon.mod_forum.lastpost": "Last post",
"addon.mod_forum.lockdiscussion": "Lock this discussion", "addon.mod_forum.lockdiscussion": "Lock this discussion",
"addon.mod_forum.lockupdated": "The lock option has been updated.", "addon.mod_forum.lockupdated": "The lock option has been updated.",
"addon.mod_forum.message": "Message", "addon.mod_forum.message": "Message",

2
src/core/course/components/format/core-course-format.html
View File

@ -14,7 +14,7 @@
<div text-wrap *ngIf="displaySectionSelector && sections && sections.length" padding class="clearfix" ion-row justify-content-between class="safe-padding-horizontal" [class.core-section-download]="downloadEnabled"> <div text-wrap *ngIf="displaySectionSelector && sections && sections.length" padding class="clearfix" ion-row justify-content-between class="safe-padding-horizontal" [class.core-section-download]="downloadEnabled">
<button float-start ion-button icon-start icon-end (click)="showSectionSelector($event)" color="light" class="core-button-select button-no-uppercase" ion-col [attr.aria-label]="('core.course.sections' | translate) + ': ' + (selectedSection && (selectedSection.formattedName || selectedSection.name))" aria-haspopup="true" [attr.aria-expanded]="sectionSelectorExpanded" aria-controls="core-course-section-selector" id="core-course-section-button"> <button float-start ion-button icon-start icon-end (click)="showSectionSelector($event)" color="light" class="core-button-select button-no-uppercase" ion-col [attr.aria-label]="('core.course.sections' | translate) + ': ' + (selectedSection && (selectedSection.formattedName || selectedSection.name))" aria-haspopup="true" [attr.aria-expanded]="sectionSelectorExpanded" aria-controls="core-course-section-selector" id="core-course-section-button">
<core-icon name="fa-folder"></core-icon> <core-icon name="fa-folder"></core-icon>
<span class="core-section-selector-text">{{selectedSection && (selectedSection.formattedName || selectedSection.name) || 'core.course.sections' | translate }}</span> <span class="core-button-select-text">{{selectedSection && (selectedSection.formattedName || selectedSection.name) || 'core.course.sections' | translate }}</span>
<ion-icon name="arrow-dropdown" ios="md-arrow-dropdown"></ion-icon> <ion-icon name="arrow-dropdown" ios="md-arrow-dropdown"></ion-icon>
</button> </button>
<!-- Section download. --> <!-- Section download. -->

7
src/core/course/components/format/format.scss
View File

@ -6,13 +6,6 @@ ion-app.app-root ion-badge.core-course-download-section-progress {
ion-app.app-root core-course-format { ion-app.app-root core-course-format {
button.core-button-select .core-section-selector-text {
overflow: hidden;
text-overflow: ellipsis;
line-height: 2em;
white-space: nowrap;
}
.core-format-progress-list { .core-format-progress-list {
margin-bottom: 0; margin-bottom: 0;