-
-
-
-
- {{discussion.userfullname}}
-
- {{discussion.created | coreDateDayOrTime}}
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
- {{ 'addon.mod_forum.postisprivatereply' | translate }}
+
-
-
+
diff --git a/src/addon/mod/forum/pages/discussion/discussion.scss b/src/addon/mod/forum/pages/discussion/discussion.scss
index f9013b8f7..54d9b1f0c 100644
--- a/src/addon/mod/forum/pages/discussion/discussion.scss
+++ b/src/addon/mod/forum/pages/discussion/discussion.scss
@@ -1,5 +1,5 @@
ion-app.app-root page-addon-mod-forum-discussion {
- .card.highlight .card-header .item {
+ .highlight .card-header .item {
background-color: $gray-lighter;
@include darkmode() {
background-color: $black;
diff --git a/src/addon/mod/forum/pages/discussion/discussion.ts b/src/addon/mod/forum/pages/discussion/discussion.ts
index 6cf56461f..b4b5d424d 100644
--- a/src/addon/mod/forum/pages/discussion/discussion.ts
+++ b/src/addon/mod/forum/pages/discussion/discussion.ts
@@ -89,6 +89,7 @@ export class AddonModForumDiscussionPage implements OnDestroy {
hasOfflineRatings: boolean;
protected ratingOfflineObserver: any;
protected ratingSyncObserver: any;
+ protected changeDiscObserver: any;
constructor(navParams: NavParams,
network: Network,
@@ -130,13 +131,17 @@ export class AddonModForumDiscussionPage implements OnDestroy {
* View loaded.
*/
ionViewDidLoad(): void {
- this.fetchPosts(true, false, true).then(() => {
- if (this.postId) {
- // Scroll to the post.
- setTimeout(() => {
- this.domUtils.scrollToElementBySelector(this.content, '#addon-mod_forum-post-' + this.postId);
- });
- }
+ this.sitesProvider.getCurrentSite().getLocalSiteConfig('AddonModForumDiscussionSort', this.sort).then((value) => {
+ this.sort = value;
+ }).finally(() => {
+ this.fetchPosts(true, false, true).then(() => {
+ if (this.postId) {
+ // Scroll to the post.
+ setTimeout(() => {
+ this.domUtils.scrollToElementBySelector(this.content, '#addon-mod_forum-post-' + this.postId);
+ });
+ }
+ });
});
}
@@ -183,6 +188,20 @@ export class AddonModForumDiscussionPage implements OnDestroy {
this.hasOfflineRatings = false;
}
});
+
+ this.changeDiscObserver = this.eventsProvider.on(AddonModForumProvider.CHANGE_DISCUSSION_EVENT, (data) => {
+ this.forumProvider.invalidateDiscussionsList(this.forum.id).finally(() => {
+ if (typeof data.locked != 'undefined') {
+ this.discussion.locked = data.locked;
+ }
+ if (typeof data.pinned != 'undefined') {
+ this.discussion.pinned = data.pinned;
+ }
+ if (typeof data.starred != 'undefined') {
+ this.discussion.starred = data.starred;
+ }
+ });
+ });
}
/**
@@ -498,6 +517,7 @@ export class AddonModForumDiscussionPage implements OnDestroy {
changeSort(type: SortType): Promise {
this.discussionLoaded = false;
this.sort = type;
+ this.sitesProvider.getCurrentSite().setLocalSiteConfig('AddonModForumDiscussionSort', this.sort);
this.domUtils.scrollToTop(this.content);
return this.fetchPosts();
@@ -610,6 +630,7 @@ export class AddonModForumDiscussionPage implements OnDestroy {
this.syncManualObserver && this.syncManualObserver.off();
this.ratingOfflineObserver && this.ratingOfflineObserver.off();
this.ratingSyncObserver && this.ratingSyncObserver.off();
+ this.changeDiscObserver && this.changeDiscObserver.off();
}
/**
diff --git a/src/addon/mod/forum/providers/forum.ts b/src/addon/mod/forum/providers/forum.ts
index 55a568574..c59e5cdf7 100644
--- a/src/addon/mod/forum/providers/forum.ts
+++ b/src/addon/mod/forum/providers/forum.ts
@@ -35,7 +35,7 @@ export class AddonModForumProvider {
static NEW_DISCUSSION_EVENT = 'addon_mod_forum_new_discussion';
static REPLY_DISCUSSION_EVENT = 'addon_mod_forum_reply_discussion';
static VIEW_DISCUSSION_EVENT = 'addon_mod_forum_view_discussion';
- static CHANGE_DISCUSSION_EVENT = 'addon_mod_forum_lock_discussion';
+ static CHANGE_DISCUSSION_EVENT = 'addon_mod_forum_change_discussion_status';
static MARK_READ_EVENT = 'addon_mod_forum_mark_read';
static PREFERENCE_SORTORDER = 'forum_discussionlistsortorder';
diff --git a/src/addon/mod/resource/components/index/index.ts b/src/addon/mod/resource/components/index/index.ts
index 6c33136a3..12913fe40 100644
--- a/src/addon/mod/resource/components/index/index.ts
+++ b/src/addon/mod/resource/components/index/index.ts
@@ -134,6 +134,8 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
return this.resourceHelper.getEmbeddedHtml(this.module, this.courseId).then((html) => {
this.contentText = html;
+
+ this.mode = this.contentText.length > 0 ? 'embedded' : 'external';
});
} else {
this.mode = 'external';
diff --git a/src/addon/mod/resource/providers/helper.ts b/src/addon/mod/resource/providers/helper.ts
index e751bf2c5..df5dfc870 100644
--- a/src/addon/mod/resource/providers/helper.ts
+++ b/src/addon/mod/resource/providers/helper.ts
@@ -53,23 +53,7 @@ export class AddonModResourceHelperProvider {
getEmbeddedHtml(module: any, courseId: number): Promise {
return this.courseHelper.downloadModuleWithMainFileIfNeeded(module, courseId, AddonModResourceProvider.COMPONENT,
module.id, module.contents).then((result) => {
- const file = module.contents[0],
- ext = this.mimetypeUtils.getFileExtension(file.filename),
- type = this.mimetypeUtils.getExtensionType(ext),
- mimeType = this.mimetypeUtils.getMimeType(ext);
-
- if (type == 'image') {
- return '
';
- }
-
- if (type == 'audio' || type == 'video') {
- return '<' + type + ' controls title="' + file.filename + '"" src="' + result.path + '">' +
- '' +
- '';
- }
-
- // Shouldn't reach here, the user should have called CoreMimetypeUtilsProvider#canBeEmbedded.
- return '';
+ return this.mimetypeUtils.getEmbeddedHtml(module.contents[0], result.path);
});
}
diff --git a/src/addon/mod/workshop/components/submission/addon-mod-workshop-submission.html b/src/addon/mod/workshop/components/submission/addon-mod-workshop-submission.html
index 0db614d75..70b4e7063 100644
--- a/src/addon/mod/workshop/components/submission/addon-mod-workshop-submission.html
+++ b/src/addon/mod/workshop/components/submission/addon-mod-workshop-submission.html
@@ -25,12 +25,7 @@
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/files/files.ts b/src/components/files/files.ts
new file mode 100644
index 000000000..551c81137
--- /dev/null
+++ b/src/components/files/files.ts
@@ -0,0 +1,82 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Component, Input, OnInit, DoCheck, KeyValueDiffers } from '@angular/core';
+import { CoreMimetypeUtilsProvider } from '@providers/utils/mimetype';
+import { CoreUtilsProvider } from '@providers/utils/utils';
+
+/**
+ * Component to render a file list.
+ *
+ *
+ *
+ */
+@Component({
+ selector: 'core-files',
+ templateUrl: 'core-files.html'
+})
+export class CoreFilesComponent implements OnInit, DoCheck {
+ @Input() files: any[]; // List of files.
+ @Input() component: string; // Component the downloaded files will be linked to.
+ @Input() componentId: string | number; // Component ID.
+ @Input() alwaysDownload?: boolean | string; // Whether it should always display the refresh button when the file is downloaded.
+ // Use it for files that you cannot determine if they're outdated or not.
+ @Input() canDownload?: boolean | string = true; // Whether file can be downloaded.
+ @Input() showSize?: boolean | string = true; // Whether show filesize.
+ @Input() showTime?: boolean | string = true; // Whether show file time modified.
+ @Input() showInline = false; // If true, it will reorder and try to show inline files first.
+
+ contentText: string;
+
+ protected differ: any; // To detect changes in the data input.
+
+ constructor(protected mimetypeUtils: CoreMimetypeUtilsProvider,
+ protected utils: CoreUtilsProvider,
+ differs: KeyValueDiffers) {
+ this.differ = differs.find([]).create();
+ }
+
+ /**
+ * Component being initialized.
+ */
+ ngOnInit(): void {
+ if (this.utils.isTrueOrOne(this.showInline)) {
+ this.renderInlineFiles();
+ }
+ }
+
+ /**
+ * Detect and act upon changes that Angular can’t or won’t detect on its own (objects and arrays).
+ */
+ ngDoCheck(): void {
+ if (this.utils.isTrueOrOne(this.showInline)) {
+ // Check if there's any change in the files array.
+ const changes = this.differ.diff(this.files);
+ if (changes) {
+ this.renderInlineFiles();
+ }
+ }
+ }
+
+ /**
+ * Calculate contentText based on fils that can be rendered inline.
+ */
+ protected renderInlineFiles(): void {
+ this.contentText = this.files.reduce((previous, file) => {
+ const text = this.mimetypeUtils.getEmbeddedHtml(file);
+
+ return text ? previous + '
' + text : previous; + }, ''); + } +} diff --git a/src/providers/utils/mimetype.ts b/src/providers/utils/mimetype.ts index d45d9af87..47dc09037 100644 --- a/src/providers/utils/mimetype.ts +++ b/src/providers/utils/mimetype.ts @@ -138,6 +138,40 @@ export class CoreMimetypeUtilsProvider { } } + /** + * Set the embed type to display an embedded file and mimetype if not found. + * + * @param file File object. + * @paran path Alternative path that will override fileurl from file object. + */ + getEmbeddedHtml(file: any, path?: string): string { + let ext; + + if (file.mimetype) { + ext = this.getExtension(file.mimetype); + } else { + ext = this.getFileExtension(file.filename); + file.mimetype = this.getMimeType(ext); + } + + if (this.canBeEmbedded(ext)) { + file.embedType = this.getExtensionType(ext); + + path = path || file.fileurl; + + if (file.embedType == 'image') { + return '
';
+ }
+ if (file.embedType == 'audio' || file.embedType == 'video') {
+ return '<' + file.embedType + ' controls title="' + file.filename + '" src="' + path + '">' +
+ '' +
+ '';
+ }
+ }
+
+ return '';
+ }
+
/**
* Get the URL of the icon of an extension.
*
+
+
+
+
+
+
+
-
-
-
-
-
-
- {{ 'addon.mod_forum.subject' | translate }}
-
-
- {{ 'addon.mod_forum.message' | translate }}
-
-
- {{ 'addon.mod_forum.privatereply' | translate }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/addon/mod/forum/components/post/post.scss b/src/addon/mod/forum/components/post/post.scss
index 43358381e..995dc2f13 100644
--- a/src/addon/mod/forum/components/post/post.scss
+++ b/src/addon/mod/forum/components/post/post.scss
@@ -1,5 +1,68 @@
-ion-app.app-root addon-mod-forum-post {
+ion-app.app-root addon-mod-forum-post .addon-mod_forum-post {
+ background-color: $white;
+ border-bottom: 1px solid $list-md-border-color;
+
.addon-forum-star {
color: $core-star-color;
}
+
+ .card-header .item {
+ .label {
+ margin-top: 4px;
+
+ h2 {
+ margin-top: 8px;
+ margin-bottom: 8px;
+ font-weight: bold;
+ ion-icon {
+ @include margin(0, 6px, 0, 0);
+ }
+ }
+ h3 {
+ font-size: 1.6rem;
+ }
+ }
+
+ ion-avatar {
+ width: $addon-forum-avatar-size;
+ height: $addon-forum-avatar-size;
+ min-width: $addon-forum-avatar-size;
+ min-height: $addon-forum-avatar-size;
+ &[item-start] {
+ @include margin(0, 8px, 0, 0);
+ }
+ img {
+ width: $addon-forum-avatar-size;
+ height: $addon-forum-avatar-size;
+ }
+ }
+
+ .addon-mod-forum-post-title,
+ .addon-mod-forum-post-info {
+ display: flex;
+ align-items: center;
+ }
+
+ .addon-mod-forum-post-info {
+ margin-top: 8px;
+ }
+
+ .addon-mod-forum-post-title + .addon-mod-forum-post-info {
+ margin-top: 0px;
+ }
+
+ .addon-mod-forum-post-title h2,
+ .addon-mod-forum-post-info .addon-mod-forum-post-author {
+ flex-grow: 1;
+ }
+ }
+
+ .item .item-inner {
+ border-bottom: 0;
+ }
+
+ .addon-mod-forum-post-more-info div {
+ font-size: 1.4rem;
+ }
}
+
diff --git a/src/addon/mod/forum/components/post/post.ts b/src/addon/mod/forum/components/post/post.ts
index 36a91e531..74801550b 100644
--- a/src/addon/mod/forum/components/post/post.ts
+++ b/src/addon/mod/forum/components/post/post.ts
@@ -54,6 +54,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy {
uniqueId: string;
advanced = false; // Display all form fields.
tagsEnabled: boolean;
+ displaySubject = true;
protected syncId: string;
@@ -78,6 +79,11 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy {
*/
ngOnInit(): void {
this.uniqueId = this.post.id ? 'reply' + this.post.id : 'edit' + this.post.parent;
+
+ const reTranslated = this.translate.instant('addon.mod_forum.re');
+ this.displaySubject = this.post.parent == 0 ||
+ (this.post.subject != this.defaultSubject && this.post.subject != 'Re: ' + this.defaultSubject &&
+ this.post.subject != reTranslated + this.defaultSubject);
}
/**
diff --git a/src/addon/mod/forum/pages/discussion/discussion.html b/src/addon/mod/forum/pages/discussion/discussion.html
index 571c89738..9615fd88a 100644
--- a/src/addon/mod/forum/pages/discussion/discussion.html
+++ b/src/addon/mod/forum/pages/discussion/discussion.html
@@ -38,12 +38,12 @@
+
+
+
+
+
+
+
+
+
+
+ {{ 'addon.mod_forum.postisprivatereply' | translate }}
+
+
+
+
+
+
+
- {{ 'core.tag.tags' | translate }}:
+
-
-
-
+
+
+
+
+
+ {{ 'addon.mod_forum.subject' | translate }}
+
+
+ {{ 'addon.mod_forum.message' | translate }}
+
+
+ {{ 'addon.mod_forum.privatereply' | translate }}
+
+
+
+
+
-
-
-{{ 'core.tag.tags' | translate }}:
- ' + text : previous; + }, ''); + } +} diff --git a/src/providers/utils/mimetype.ts b/src/providers/utils/mimetype.ts index d45d9af87..47dc09037 100644 --- a/src/providers/utils/mimetype.ts +++ b/src/providers/utils/mimetype.ts @@ -138,6 +138,40 @@ export class CoreMimetypeUtilsProvider { } } + /** + * Set the embed type to display an embedded file and mimetype if not found. + * + * @param file File object. + * @paran path Alternative path that will override fileurl from file object. + */ + getEmbeddedHtml(file: any, path?: string): string { + let ext; + + if (file.mimetype) { + ext = this.getExtension(file.mimetype); + } else { + ext = this.getFileExtension(file.filename); + file.mimetype = this.getMimeType(ext); + } + + if (this.canBeEmbedded(ext)) { + file.embedType = this.getExtensionType(ext); + + path = path || file.fileurl; + + if (file.embedType == 'image') { + return '