diff --git a/scripts/langindex.json b/scripts/langindex.json
index 40c4b9144..af83bf1ca 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1104,13 +1104,17 @@
"addon.report_insights.notapplicable": "analytics",
"addon.report_insights.notuseful": "analytics",
"addon.report_insights.useful": "analytics",
+ "addon.storagemanager.coursedownloads": "local_moodlemobileapp",
+ "addon.storagemanager.courseinfo": "local_moodlemobileapp",
+ "addon.storagemanager.coursesspaceusage": "local_moodlemobileapp",
"addon.storagemanager.deletecourse": "local_moodlemobileapp",
"addon.storagemanager.deletecourses": "local_moodlemobileapp",
+ "addon.storagemanager.deletedata": "local_moodlemobileapp",
"addon.storagemanager.deletedatafrom": "local_moodlemobileapp",
- "addon.storagemanager.info": "local_moodlemobileapp",
- "addon.storagemanager.managecoursestorage": "local_moodlemobileapp",
- "addon.storagemanager.managestorage": "local_moodlemobileapp",
- "addon.storagemanager.storageused": "local_moodlemobileapp",
+ "addon.storagemanager.downloadedcourses": "local_moodlemobileapp",
+ "addon.storagemanager.managedownloads": "local_moodlemobileapp",
+ "addon.storagemanager.totaldownloads": "local_moodlemobileapp",
+ "addon.storagemanager.totalspaceusage": "local_moodlemobileapp",
"assets.countries.AD": "countries",
"assets.countries.AE": "countries",
"assets.countries.AF": "countries",
diff --git a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
index 6c3d9ffa6..dbdf6d578 100644
--- a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
+++ b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
@@ -4,7 +4,7 @@
-
1" class="core-button-spinner">
+
1" class="core-button-spinner">
@@ -77,8 +77,8 @@
-
+
diff --git a/src/addons/block/myoverview/components/myoverview/myoverview.ts b/src/addons/block/myoverview/components/myoverview/myoverview.ts
index 97258edd6..5b676a067 100644
--- a/src/addons/block/myoverview/components/myoverview/myoverview.ts
+++ b/src/addons/block/myoverview/components/myoverview/myoverview.ts
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-import { Component, OnInit, Input, OnDestroy, OnChanges, SimpleChange } from '@angular/core';
+import { Component, OnInit, OnDestroy } from '@angular/core';
import { ModalOptions } from '@ionic/core';
import { CoreEventObserver, CoreEvents } from '@singletons/events';
import { CoreTimeUtils } from '@services/utils/time';
@@ -40,9 +40,7 @@ const FILTER_PRIORITY: AddonBlockMyOverviewTimeFilters[] = ['all', 'inprogress',
selector: 'addon-block-myoverview',
templateUrl: 'addon-block-myoverview.html',
})
-export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implements OnInit, OnChanges, OnDestroy {
-
- @Input() downloadEnabled = false;
+export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implements OnInit, OnDestroy {
filteredCourses: CoreEnrolledCourseDataWithOptions[] = [];
@@ -197,16 +195,6 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
});
}
- /**
- * @inheritdoc
- */
- ngOnChanges(changes: {[name: string]: SimpleChange}): void {
- if (changes.downloadEnabled && !changes.downloadEnabled.previousValue && this.downloadEnabled && this.loaded) {
- // Download all courses is enabled now, initialize it.
- this.initPrefetchCoursesIcons();
- }
- }
-
/**
* @inheritdoc
*/
@@ -431,7 +419,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
* @return Promise resolved when done.
*/
async initPrefetchCoursesIcons(): Promise {
- if (this.prefetchIconsInitialized || !this.downloadEnabled) {
+ if (this.prefetchIconsInitialized) {
// Already initialized.
return;
}
diff --git a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
index 113048db0..6ba01b2f2 100644
--- a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
+++ b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
@@ -16,8 +16,8 @@
diff --git a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
index f3b99dcd6..eefd70ac4 100644
--- a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
+++ b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-import { Component, OnInit, OnDestroy, Input } from '@angular/core';
+import { Component, OnInit, OnDestroy } from '@angular/core';
import { CoreEventObserver, CoreEvents } from '@singletons/events';
import { CoreSites } from '@services/sites';
import {
@@ -41,17 +41,13 @@ import { CoreSite } from '@classes/site';
})
export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseComponent implements OnInit, OnDestroy {
- @Input() downloadEnabled = false;
-
courses: AddonBlockRecentlyAccessedCourse[] = [];
- downloadCourseEnabled = false;
scrollElementId!: string;
protected site!: CoreSite;
protected isDestroyed = false;
protected coursesObserver?: CoreEventObserver;
- protected updateSiteObserver?: CoreEventObserver;
protected fetchContentDefaultError = 'Error getting recent courses data.';
constructor() {
@@ -69,15 +65,6 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
this.scrollElementId = `addon-block-recentlyaccessedcourses-scroll-${scrollId}`;
- // Refresh the enabled flags if enabled.
- this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
-
- // Refresh the enabled flags if site is updated.
- this.updateSiteObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
- this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
-
- }, this.site.getId());
-
this.coursesObserver = CoreEvents.on(
CoreCoursesProvider.EVENT_MY_COURSES_UPDATED,
(data) => {
@@ -208,7 +195,6 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
ngOnDestroy(): void {
this.isDestroyed = true;
this.coursesObserver?.off();
- this.updateSiteObserver?.off();
}
}
diff --git a/src/addons/block/sitemainmenu/components/sitemainmenu/sitemainmenu.ts b/src/addons/block/sitemainmenu/components/sitemainmenu/sitemainmenu.ts
index d550062d7..836a5850c 100644
--- a/src/addons/block/sitemainmenu/components/sitemainmenu/sitemainmenu.ts
+++ b/src/addons/block/sitemainmenu/components/sitemainmenu/sitemainmenu.ts
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-import { Component, OnInit, Input } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
import { CoreSites } from '@services/sites';
import { CoreCourse } from '@features/course/services/course';
import { CoreCourseHelper, CoreCourseSection } from '@features/course/services/course-helper';
@@ -29,8 +29,6 @@ import { CoreBlockBaseComponent } from '@features/block/classes/base-block-compo
})
export class AddonBlockSiteMainMenuComponent extends CoreBlockBaseComponent implements OnInit {
- @Input() downloadEnabled = false;
-
component = 'AddonBlockSiteMainMenu';
mainMenuBlock?: CoreCourseSection;
siteHomeId = 1;
diff --git a/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html b/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
index fd6a1a860..1ff007fce 100644
--- a/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
+++ b/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
@@ -16,8 +16,8 @@
diff --git a/src/addons/block/starredcourses/components/starredcourses/starredcourses.ts b/src/addons/block/starredcourses/components/starredcourses/starredcourses.ts
index fc1c47de5..c6e6fc447 100644
--- a/src/addons/block/starredcourses/components/starredcourses/starredcourses.ts
+++ b/src/addons/block/starredcourses/components/starredcourses/starredcourses.ts
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-import { Component, OnInit, OnDestroy, Input } from '@angular/core';
+import { Component, OnInit, OnDestroy } from '@angular/core';
import { CoreEventObserver, CoreEvents } from '@singletons/events';
import { CoreSites } from '@services/sites';
import { CoreCoursesProvider, CoreCoursesMyCoursesUpdatedEventData, CoreCourses } from '@features/courses/services/courses';
@@ -36,17 +36,13 @@ import { AddonBlockStarredCourse, AddonBlockStarredCourses } from '../../service
})
export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent implements OnInit, OnDestroy {
- @Input() downloadEnabled = false;
-
courses: AddonBlockStarredCoursesCourse[] = [];
- downloadCourseEnabled = false;
scrollElementId!: string;
protected site: CoreSite;
protected isDestroyed = false;
protected coursesObserver?: CoreEventObserver;
- protected updateSiteObserver?: CoreEventObserver;
protected fetchContentDefaultError = 'Error getting starred courses data.';
constructor() {
@@ -64,14 +60,6 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
this.scrollElementId = `addon-block-starredcourses-scroll-${scrollId}`;
- // Refresh the enabled flags if enabled.
- this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
-
- // Refresh the enabled flags if site is updated.
- this.updateSiteObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
- this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
- }, CoreSites.getCurrentSiteId());
-
this.coursesObserver = CoreEvents.on(
CoreCoursesProvider.EVENT_MY_COURSES_UPDATED,
(data) => {
@@ -194,7 +182,6 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
ngOnDestroy(): void {
this.isDestroyed = true;
this.coursesObserver?.off();
- this.updateSiteObserver?.off();
}
}
diff --git a/src/addons/storagemanager/lang.json b/src/addons/storagemanager/lang.json
index 389a65e62..1641c3b96 100644
--- a/src/addons/storagemanager/lang.json
+++ b/src/addons/storagemanager/lang.json
@@ -1,9 +1,13 @@
{
- "deletecourse": "Offload all course data",
- "deletecourses": "Offload all courses data",
- "deletedatafrom": "Offload data from {{name}}",
- "info": "Files stored on your device make the app work faster and enable the app to be used offline. You can safely offload files if you need to free up storage space.",
- "managestorage": "Manage storage",
- "managecoursestorage": "Manage course storage",
- "storageused": "File storage used:"
+ "deletedata": "Delete offline data",
+ "deletecourse": "Delete offline data from this course",
+ "deletecourses": "Delete offline data from all courses",
+ "deletedatafrom": "Delete offline data from {{name}}",
+ "courseinfo": "Download course content to work offline. Your activity will sync automatically when your device is back online.",
+ "managedownloads": "Manage downloads",
+ "coursedownloads": "Course downloads",
+ "totaldownloads": "Total downloads",
+ "totalspaceusage": "Total space usage",
+ "coursesspaceusage": "Courses space usage",
+ "downloadedcourses": "Downloaded courses"
}
diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.html b/src/addons/storagemanager/pages/course-storage/course-storage.html
index 3b15683d5..4db31b1e0 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.html
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.html
@@ -4,7 +4,7 @@
- {{ 'addon.storagemanager.managecoursestorage' | translate }}
+ {{ 'addon.storagemanager.coursedownloads' | translate }}
@@ -12,20 +12,19 @@
+ {{ 'addon.storagemanager.courseinfo' | translate }}
{{ title }}
- {{ 'addon.storagemanager.info' | translate }}
-
- {{ 'addon.storagemanager.storageused' | translate }}
+ {{ 'addon.storagemanager.totaldownloads' | translate }}
{{ totalSize | coreBytesToSize }}
-
+
-
+
{{ prefetchCourseData.statusTranslatable | translate }}
@@ -48,7 +47,7 @@